Skip to content
Commit a24d46cf 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 nyc-mr2-dev am: 121d3b89  -s ours am: 95e10b29 am: c3e2d403
am: bb7fc483

Change-Id: Iafccb0596c104fab9aceb428a082f55b804f02cf
parents 1a2c28c9 bb7fc483
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