commit | a76dc389ee87c7706133ef27a50cab0c45ddb21f | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 14 18:47:43 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 14 18:47:43 2017 +0000 |
tree | c9f901d89a1848d75d6d0cf788b2ba85fca80b5a | |
parent | 1fceacc297de33e46e9c8dffc8944bb784dbb0ca [diff] | |
parent | 4c281167d7144c73d30e69e48cd97bbf95f06b69 [diff] |
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