Skip to content
Commit 60b9835e 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 am: 9b0a6a35  -s ours am: f1a95220 am: c6ca9254 am: 7fd4bec1 am: b00fd6bb am: 93d9ac25  -s ours am: 1ce0456b am: a9d3b4d8
am: ea0b574e

Change-Id: I998c65ff305494f8527f97c4b4d28fb4f791585d
parents 09ec0dc6 ea0b574e
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