Skip to content
Commit 29c8b112 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  -s ours am: 9fbf077e  -s ours
am: 9eb5f2cd  -s ours

Change-Id: Ib24fadaf19a0f200d0718e2e0aa863de3dd67054
parents 437a0278 9eb5f2cd
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