Skip to content
Commit 0bf8100f 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
am: f4e23cbc

Change-Id: I591a950a87fe432d415794157d80f08888e08b2a
parents 0ede3a0a f4e23cbc
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