tree fbb0f18b72dc8626f8d88a887e41ad2502eebf14
parent 55ffaea04b00927ec259f1a0279b1be199c69b8b
parent 7b1157a92edb5c531238b8f0d9092d3e41d84786
author Beverly Tai <beverlyt@google.com> 1508451611 +0000
committer android-build-merger <android-build-merger@google.com> 1508451611 +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

Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1