Skip to content
Commit 8ee7f6a5 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-dev am: 0bdb7902 am: 3be1269c  -s ours am: 0a93f42b am: 8462da77 am: ba55b3be  -s ours am: ef696aa4
am: a35989b0

Change-Id: I05764035a31a1be641f3c2aea4bda9b1770e8aa0
parents 6d23578d a35989b0
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