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

Change-Id: Id56d8fb2630c03f7588ba475dafa48f5f7bab011


Trivial merge