Skip to content
Commit 9ac371a8 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 mnc-dev am: 89a94b70  -s ours am: d0d0fea3 am: ff058a78 am: c64209fb  -s ours am: 5252746f am: b4913b70 am: 6cd11423 am: 4bdddadc am: be95e1d9  -s ours am: ff5a0512 am: 0392ba5f am: 517bb6ea" into oc-mr1-dev-plus-aosp
am: 071443e9  -s ours

Change-Id: I62ede21d3aeec251d7c702da3ee824d4a8c49e17
parents 6f76cee0 071443e9
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