OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr...
authorBeverly Tai <beverlyt@google.com>
Thu, 14 Sep 2017 15:19:03 +0000 (15:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 15:19:03 +0000 (15:19 +0000)
commita62951f28f0a2289a7e8bac34650b43e34143874
tree0d78f4d427601aef02fe3b946c3fb7114a3b3a6b
parentabc34179615e293266ea729250b769b2aa7fa170
parent2435c816d82862b1dd288091edecac8286604850
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908  -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892  -s ours
am: 2435c816d8

Change-Id: Idba71a4e659947f4ebf0dd76c3d305bc3a9132e6