Skip to content
Commit 9b0a6a35 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 lmp-dev am: e1adf224  -s ours am: 3ca0cc0a  -s ours am: 01ae4459 am: 3d600ede
am: d34366e7

Change-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81
parents 2bab19f9 d34366e7
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