| commit | 708f1b8cdca593155e4c572ebe2ebc3ee257c84c | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Fri Oct 20 01:35:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 01:35:34 2017 +0000 |
| tree | e2d0fa64b38c3580ef1f1fbf6d6af1cafc6af792 | |
| parent | 0b3fd511efdbe7d174b2b56c7cbd2a6a5e8384f4 [diff] | |
| parent | 11a7e42c8ed5d589452c9025aedda7b8af1d31a1 [diff] |
Merge "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" into oc-mr1-dev-plus-aosp am: 11a7e42c8e -s ours Change-Id: I867f4fbe0817122c169b946a8d5c00d662e49ef4