OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
authorBeverly Tai <beverlyt@google.com>
Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)
commitd0d0fea3d6b032c460dc26e5b250b61bed88718c
tree6d11e7bff6288c99dc618666047f09625ec4dde5
parent028ad8d498be62a6a0884b81533d25571596b486
parent89a94b706df307c5c7032c81b79a4f79ca3d1d6c
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am: 89a94b706d  -s ours

Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36