commit | 78e5603472fb94dbf9bd78524f3e1861c7069af7 | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Thu Sep 14 18:19:07 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 14 18:19:07 2017 +0000 |
tree | 9ac7eadc6c47c51594511779f8955e48cd0978a1 | |
parent | add643c33766023177301482b5372887ff32b208 [diff] | |
parent | ba4b1cdcffb6d3b5280e0c59ec4861a9c5c2ab98 [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: ba4b1cdcff Change-Id: Ib1e5ab053cb28ad310d406cd383b446abdb9e797