Skip to content
Commit 9fbf077e 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

Change-Id: I28bb498ea60d1a42d4b557f0b58c7134650bb3dd
parents 5dab2f29 fe5ce91c
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