commit | be759f545ae1eaaaae174c85211fe2f36397ad94 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Oct 30 16:42:31 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 30 16:42:31 2019 -0700 |
tree | 5bc6050b6091dbd6d3cadb91e7a1b86cce95a115 | |
parent | c2eadfacda9012e6b41f5c21c806fc877a29404c [diff] | |
parent | 26902c629628bb22026e2e2337f2197c54cfa905 [diff] |
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: a666e34e65 am: 110f6d3109 -s ours am skip reason: subject contains skip directive Change-Id: Ief7adaa45a1406639d4d124aa28d07c3deaf2281