Skip to content
Commit 295ce6ea authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902 am: 3be1269c  -s ours am: 0a93f42b am: 8462da77 am: ba55b3be  -s ours am: ef696aa4 am: a35989b0 am: ba4b1cdc" into oc-mr1-dev-plus-aosp
parents 7e3c88cc 78e56034
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