OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 19:17:28 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 19:17:28 +0000 (19:17 +0000)
commit588c61bb062d5be073a198c5c13952b055740d70
tree874d89f177df0138c719f0d938ffa5dba10313a9
parent9ccc1dcd4d8bc004d8406633d1ced071eea64312
parent7c8a60c3e4171c2128821e8a6574baa2e4f36a5e
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a  -s ours am: fe5ce91c5f
am: 7c8a60c3e4  -s ours

Change-Id: Iddf985fd988f5a561b8211fb1df28b805319fe3d