tree 9ea86adf4b5f09195f56560b94f9a27db20339e7
parent a4454ba4a96a1c47d25d0f4128e3ce4132f0486d
parent 5fda53b294aa73304b60a6287103a6423c922cb1
author Beverly Tai <beverlyt@google.com> 1508453783 +0000
committer android-build-merger <android-build-merger@google.com> 1508453783 +0000

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d  -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e  -s ours am: bcdb9079ef
am: 5fda53b294

Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251