Skip to content
Commit 88b7c9b7 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-mr2-dev am: 121d3b89  -s ours am: 95e10b29 am: c3e2d403 am: d0c9f402" into oc-mr1-dev-plus-aosp
am: c3af9af6  -s ours

Change-Id: I62dd63152f557e48c60100137bac29974432bab1
parents c69e1382 c3af9af6
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