commit | c3af9af6b2edf389993899643b933794ce7e83b7 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 14 18:37:00 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 14 18:37:00 2017 +0000 |
tree | 941d5bc82740b95c005154f6f9a65ff20c7ca2a5 | |
parent | 065f4b7ea79257127946fe77bcfe52fc66657021 [diff] | |
parent | 7860f1cd787c55c87070c6c845842fcebebd553e [diff] |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e am: c3e2d40309 am: d0c9f402d5" into oc-mr1-dev-plus-aosp