tree d86961f7c8b812b9bd17bc40a25e50ceb055872d
parent 6b4f75ec4a274ee7b1ae7952eea7835ee7287562
parent ef308dc0bc5f1544e92b365d2a3d125b53a85708
author Android Build Merger (Role) <android-build-merger@google.com> 1508459970 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1508459970 +0000

Merge "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 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac  -s ours am: b6ecd1f88a am: f2e1ef2297" into oc-dr1-dev-plus-aosp