OSDN Git Service

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

Change-Id: I8cb827ab0e34ab8538a88f23616dd27aa7bd3ff5


Trivial merge