Skip to content
Commit e082f857 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
am: 98e46b5b

Change-Id: I3051278fb2cb8f9bc470464cabf0150d91e752c4
parents 7860f1cd 98e46b5b
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