OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 18:11:18 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 18:11:18 +0000 (18:11 +0000)
commitb237ea7cc87c2c632edf23ae28e6a757422ada14
tree0d78f4d427601aef02fe3b946c3fb7114a3b3a6b
parentc3e2d40309ca337290092181e955a5a8f2838030
parent9bc160cc3d9724ef692d130e699fd857d717815e
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours am: 26e84466d3  -s ours
am: 9bc160cc3d

Change-Id: Ib152e64e01f43f3a6fb1df6c749e4f83566266b5