Skip to content
Commit 0b5a5edc 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-mr1-dev am: f2b59272  -s ours am: dfbaa1fd am: d7ece4da am: 06bd19c1 am: 7b1157a9  -s ours am: bcdb9079 am: 5fda53b2 am: 791d8a5b am: 4dd01948 am: 260ef208  -s ours am: b6ecd1f8 am: f2e1ef22
am: edc549d7

Change-Id: I4fcd58e1471efc519e2c3bcba2d1bcdca4b747e9
parents d9430fb4 edc549d7
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