Skip to content
Commit 6cd11423 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

Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899
parents 5288fcc2 b4913b70
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