commit | c6d12559319dbefb68f0c306e98eab105bb8d841 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Sep 15 07:21:22 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 15 07:21:22 2017 +0000 |
tree | 06919e845b17e5e08d5ed3dacf2b9bea229bdc56 | |
parent | d874801e1f58a2402e68f960c7e8b3ad881c4abb [diff] | |
parent | 6b660c55a8b0030ca9bcdc270aced13e06a4d82a [diff] |
Merge "Merge "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" into oc-mr1-dev am: 2dfb1bab8d" into oc-mr1-dev-plus-aosp am: a76dc389ee -s ours"