Skip to content
Commit 0a93f42b 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 nyc-dev am: 0bdb7902 

am: 3be1269c  -s ours

Change-Id: I194e18d7ac9ac98010e00db548e8f39bec220fc0
parents 0bf81b63 3be1269c
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