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:17:52 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 17:17:52 +0000 (17:17 +0000)
commit108e142d617cf3356a333579bf0805889cac92d8
tree53a476c4085bc6f0cd270d72daedc4a32991860f
parent2cf8f74180d8296a66c93932f7c850ba2a17af14
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: Ife88f86f94919d731e79f7ec5838b14fbb30a4cc