tree f762e96f4dc31d935a00aa7b9888a7105082de9d
parent 0ede3a0a9b18ec8c854746645412366358e2cccb
parent f4e23cbcfa3209840f730adb86f4b0d2f6aef8bf
author Beverly Tai <beverlyt@google.com> 1505403344 +0000
committer android-build-merger <android-build-merger@google.com> 1505403344 +0000

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
am: f4e23cbcfa

Change-Id: I591a950a87fe432d415794157d80f08888e08b2a