OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev...
authorBeverly Tai <beverlyt@google.com>
Tue, 12 Sep 2017 16:49:49 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 16:49:49 +0000 (16:49 +0000)
commitbe95e1d91e16816c620356910778625a4ef1f7a1
treebf19400e6e3b87f7ded336a2e31f87edea54ebd1
parent7359d93942e702ede04fe39f57f6b13c1d2b2bb9
parent4bdddadcc595b87b2fef441258e73a0c30970305
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

Change-Id: I0530a9ca24c432ee0a4af4861bad7976ca355070