Skip to content
Commit d0c9f402 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-mr2-dev am: 121d3b89  -s ours am: 95e10b29
am: c3e2d403

Change-Id: Ie07e84bbb31df780b8366d63bd364368a24b9134
parents 8ee7f6a5 c3e2d403
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