commit | 411df18c6cb3a05001c8c41e4f54a7269a887f73 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Sep 14 18:28:26 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 14 18:28:26 2017 +0000 |
tree | a6796f7b2d387ccc2762e55a1664ca2d577ec374 | |
parent | 1a2c28c9f4c50af9f6c9b4435acc40dd0206c300 [diff] | |
parent | 8ee7f6a5b77884fd51c5825cc8d8d1f32e98991a [diff] |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6 -s ours am: ef696aa47b am: a35989b007 am: 8ee7f6a5b7 Change-Id: I5b4a8f723063001336bbd76dd4ef810b8adca083