OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 02:09:14 +0000 (02:09 +0000)
commitf1a95220a3653eee062f585bef9c184748213069
treefbb0f18b72dc8626f8d88a887e41ad2502eebf14
parent69cc90b01cd125265856b27f149200b880c7c580
parent9b0a6a350932bef191740807101a4e107efbc888
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f  -s ours am: 3ca0cc0ae6  -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714
am: 9b0a6a3509  -s ours

Change-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5