OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 01:48:33 +0000 (01:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 01:48:33 +0000 (01:48 +0000)
commitd34366e714216ea06192d563cc9b98a03101cabd
tree1acefac006e5f72b7be101808e673ee4018c79b6
parentc26e04b0065b83c6f98429de90d8241cb6aee91f
parent3d600ede6d64b630870d7e45df437927088eb55a
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966
am: 3d600ede6d

Change-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3