OSDN Git Service

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

Change-Id: I22b9c537fb0f5e1b1414be25f20b6710d00e2f90


Trivial merge