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:01:36 +0000 (16:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)
commitff058a78ec3af5645aab29743aefbe33c9de6dcc
treec151617f1647ce498a2b1a91ace11e5e5d744ca2
parent6352ced6353220f847818ae55d0bd24e6c29a07b
parentd0d0fea3d6b032c460dc26e5b250b61bed88718c
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours
am: d0d0fea3d6

Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf