OSDN Git Service

Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution...
authorBeverly Tai <beverlyt@google.com>
Fri, 20 Oct 2017 01:35:34 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 01:35:34 +0000 (01:35 +0000)
am: 11a7e42c8e  -s ours

Change-Id: I867f4fbe0817122c169b946a8d5c00d662e49ef4


Trivial merge