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)
am: 7c8a60c3e4  -s ours

Change-Id: Iddf985fd988f5a561b8211fb1df28b805319fe3d


Trivial merge