commit | 295ce6ea5b6028f9c6b7ac53029f7af6905947c1 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 14 18:21:22 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 14 18:21:22 2017 +0000 |
tree | a6796f7b2d387ccc2762e55a1664ca2d577ec374 | |
parent | 7e3c88ccedce0e680868424838c254cbfdd2fc40 [diff] | |
parent | 78e5603472fb94dbf9bd78524f3e1861c7069af7 [diff] |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6 -s ours am: ef696aa47b am: a35989b007 am: ba4b1cdcff" into oc-mr1-dev-plus-aosp