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

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

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

Change-Id: I6bbcdf36c8f550699ad5123b1b08c30d4fff0570
parents b2ba32be be95e1d9
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