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:26:41 +0000 (15:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 15:26:41 +0000 (15:26 +0000)
commitf4e23cbcfa3209840f730adb86f4b0d2f6aef8bf
treecb9ce98c269f47f33ce553fe438f2269974c870c
parent786354a53ffb65152eb6e07aadaa17a187518061
parenta62951f28f0a2289a7e8bac34650b43e34143874
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
am: a62951f28f

Change-Id: I98176e73e4fc9e1627c638ff7510fdc35b3b874f