Commit 4366a97c authored by Daniel Xie's avatar Daniel Xie Committed by Android Git Automerger
Browse files

am ba08bcd5: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to... 

am ba08bcd5: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3a  -s ours automerge: 91994f09

* commit 'ba08bcd5':
  DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
parents 05c1ad2b ba08bcd5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment