Skip to content
Commit 588c61bb 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 oc-dev am: d740b2d0  -s ours am: fe5ce91c
am: 7c8a60c3  -s ours

Change-Id: Iddf985fd988f5a561b8211fb1df28b805319fe3d
parents 9ccc1dcd 7c8a60c3
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