OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)
am: 9b0a6a3509  -s ours

Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5


Trivial merge