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

Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0
parents 95e10b29 26e84466
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