OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
authorBeverly Tai <beverlyt@google.com>
Tue, 12 Sep 2017 17:18:01 +0000 (17:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 17:18:01 +0000 (17:18 +0000)
commit517bb6eaa60147a8434c7af45e6ce96a1bb80a84
tree7424492d67c9912d230f91b0f9bd17a7002ce0f1
parentbb3a812a713e7e5f1c81455cd645fc428df5b47b
parent0392ba5f72e08b38086c2c4344b93bc9525f8744
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a  -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e  -s ours am: ff5a0512ec
am: 0392ba5f72

Change-Id: I84fe2d446aa887c2934224c772d5b0ab7b570f5b