| commit | a8a8d47516c1f03086b82564f75b03386f4ce803 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Oct 20 01:16:27 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 01:16:27 2017 +0000 |
| tree | e95c1969c43a27c0ade6b6814e84db265c6e8805 | |
| parent | 0af34ddfc83dbb4a3ba973b792ce998087f500ec [diff] | |
| parent | a6b9a27c352d612a1faa8b766d24c356c8ef3e5e [diff] |
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 am: a6b9a27c35 Change-Id: I22b9c537fb0f5e1b1414be25f20b6710d00e2f90