Skip to content
Commit ef696aa4 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

Change-Id: I0d0ce4d4a017126cb5f6cab1fbe4da2e8ba37ce9
parents 2435c816 ba55b3be
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