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:09:38 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)
commitc64209fb6a7599fdc875466827a2040d5008501d
treee19deb720eff29e03ec2a4f4553079de9d02dea6
parent064bfd22becc3af28eb4a79b99518a5b5cab165b
parentff058a78ec3af5645aab29743aefbe33c9de6dcc
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d  -s ours am: d0d0fea3d6
am: ff058a78ec

Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef