commit | ea8f6069abbaaf8004d16b3caf564b37da4a1e65 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 31 14:58:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 31 14:58:27 2019 -0700 |
tree | d80b571a468b96cba1c22656b125283f37de3d9d | |
parent | fd5894d36f345a7cd35feaf075da02900c35bf02 [diff] | |
parent | 35359a0720d369a46933a1d19d1ff967aa05c2a2 [diff] |
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: 3b0fdeda37 am: 35359a0720 -s ours am skip reason: subject contains skip directive Change-Id: I8c5867113d6de61c935b4f2b665da88f004cf62c