Skip to content
Commit f08969c5 authored by Beverly Tai's avatar Beverly Tai Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution."... 

Merge "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 am: 98e46b5b" into oc-mr1-dev-plus-aosp
am: 262dd199  -s ours

Change-Id: I0c2c1969ca89e1a56424d1aac7b944068e246542
parents 88b7c9b7 262dd199
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