Skip to content
Commit 98e46b5b 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-mr1-dev am: 61bc3f3c am: 68f91528  -s ours am: 26e84466  -s ours am: 9bc160cc
am: b237ea7c

Change-Id: I04d50fa8ed1d66b706f5a5497543bc6b01aa1d8a
parents d0c9f402 b237ea7c
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