| commit | fe1fbfcf261b262f0a5f30312e69b201e5f16661 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Sep 15 07:06:55 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 15 07:06:55 2017 +0000 |
| tree | f53f15c9e2de069ff57c5e5563ca4cc1b44daae8 | |
| parent | 2842032ad8dabefacbe96b16531ab20d49b36579 [diff] | |
| parent | 4fc8f1f9b41d7dce4c448f9f2cffca9cb5172eb0 [diff] |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e am: c3e2d40309 am: bb7fc483f0" into oc-mr1-dev-plus-aosp am: 4fc8f1f9b4 -s ours Change-Id: I59a9187f3b2891ca707b86318da6284a2a8adf8e