OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 18:11:18 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:11:18 +0000 (18:11 +0000)
am: 9bc160cc3d

Change-Id: Ib152e64e01f43f3a6fb1df6c749e4f83566266b5


Trivial merge