OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
authorBeverly Tai <beverlyt@google.com>
Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)
am: b6ecd1f88a

Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415


Trivial merge