OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)
am: bcdb9079ef

Change-Id: Id065bc6f31814aed56fce0ddd9a1b6378d9364ee


Trivial merge