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:09:03 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 19:09:03 +0000 (19:09 +0000)
am: fe5ce91c5f

Change-Id: If9c65045e4810a08dc0a025ac740c5499547fd7e


Trivial merge