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:26:56 +0000 (17:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 17:26:56 +0000 (17:26 +0000)
commitae86706b68e2da5201cf9ab718c59c3f6c65cd13
tree16ef16586b2292e4360a97af1ec444b6807345ec
parent13ca88dbf6ee728a66a80666eacf5c4cf7b90403
parent108e142d617cf3356a333579bf0805889cac92d8
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
am: 108e142d61

Change-Id: Ic7391a1b769b3621025b007dd07863cacea3af6e