OSDN Git Service

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

Change-Id: I5b4a8f723063001336bbd76dd4ef810b8adca083


Trivial merge