commit | 86a313bc172914766df88420079de7fb0826a450 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Oct 31 14:55:36 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 31 14:55:36 2019 -0700 |
tree | f03a4de4e46123bdf0595eadf29a8f5836463847 | |
parent | cd9b9173dee5b9bf854cc12b9fe487c8a9d554ec [diff] | |
parent | c363087020b3fe0076736b5fe0f8d4f45d41679f [diff] |
[automerger skipped] Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master am: bf74d5204e am: c363087020 -s ours am skip reason: subject contains skip directive Change-Id: Id8af2a2c646446c691666a8f6a7180677f2aed38