commit | 262dd199735ec7a077c140926968de7f26da8e8a | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 14 18:40:38 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 14 18:40:38 2017 +0000 |
tree | 941d5bc82740b95c005154f6f9a65ff20c7ca2a5 | |
parent | c3af9af6b2edf389993899643b933794ce7e83b7 [diff] | |
parent | e082f857d35ba5077655eb7869b7fdcec22461da [diff] |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours am: 26e84466d3 -s ours am: 9bc160cc3d am: b237ea7cc8 am: 98e46b5bd8" into oc-mr1-dev-plus-aosp