Skip to content
Commit 7860f1cd 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: d0c9f402

Change-Id: Id0e718caf1663ff8e7c27a7b39a795dd8d3afc37
parents 4fc8f1f9 d0c9f402
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