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:56:21 +0000 (00:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 00:56:21 +0000 (00:56 +0000)
am: edc549d78e

Change-Id: I4fcd58e1471efc519e2c3bcba2d1bcdca4b747e9


Trivial merge