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:27:56 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:27:56 +0000 (18:27 +0000)
am: b237ea7cc8

Change-Id: I04d50fa8ed1d66b706f5a5497543bc6b01aa1d8a


Trivial merge