tree 2519ad12222bc46c02649e515db5f45a42064998
parent e3326296677c5c3a4da93b82e82db9872e19f58d
parent b237ea7cc87c2c632edf23ae28e6a757422ada14
author Beverly Tai <beverlyt@google.com> 1505413455 +0000
committer android-build-merger <android-build-merger@google.com> 1505413455 +0000

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3  -s ours am: 26e84466d3  -s ours am: 9bc160cc3d
am: b237ea7cc8

Change-Id: Id56d8fb2630c03f7588ba475dafa48f5f7bab011