Skip to content
Commit 262dd199 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-mr1-dev am: 61bc3f3c am: 68f91528  -s ours am: 26e84466  -s ours am: 9bc160cc am: b237ea7c am: 98e46b5b" into oc-mr1-dev-plus-aosp
parents c3af9af6 e082f857
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