Skip to content
Commit 6d23578d 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-dr-dev am: 8150eb82 am: 97b98a3b am: d54bc6a9  -s ours am: b004901c am: 9a74d618 am: 0bf81b63 am: e148e39d am: a126d948  -s ours am: 2435c816
am: a62951f2

Change-Id: I7f52c07986fbcb784b6b6b892b1c83977355c754
parents 8b70fb08 a62951f2
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