Commit 91994f09 authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to... 

Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
automerge: 8a012b3a  -s ours

* commit '8a012b3a':
  DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
parents c25d8adf 8a012b3a
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