Skip to content
Commit fe1fbfcf authored by Beverly Tai's avatar Beverly Tai Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution."... 

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89  -s ours am: 95e10b29 am: c3e2d403 am: bb7fc483" into oc-mr1-dev-plus-aosp
am: 4fc8f1f9  -s ours

Change-Id: I59a9187f3b2891ca707b86318da6284a2a8adf8e
parents 2842032a 4fc8f1f9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment