commit | 09ec0dc6f66a0b12c0348c561b1661f9e70a7759 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Oct 19 04:16:51 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 19 04:16:51 2017 +0000 |
tree | 9bd8b076e19034ee9c07ad53310fac74e4d03702 | |
parent | 8cd9c1e9ad5d529bd6fad8fcb48af1fa426ecd5a [diff] | |
parent | 2366ea9e617f6d89e2813dc61d15e4558af59baf [diff] |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806 am: 1fa3f2a9d0" into oc-mr1-dev-plus-aosp