commit | 0e9cfc7ed123dc9cf01c9f26ff20ca8ddcdc1621 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:46:57 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:46:57 2019 -0700 |
tree | af2ad3a6a20f863f8a55074f82c64c5999e8a2a1 | |
parent | 1c4b95fb56d8df479c811011fd0aa76306fadeef [diff] | |
parent | f93a7b709fefdbf364e29a49da7ca5bd1907fa85 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: d6651f2888 -s ours am: 565a5cb181 am: 9618806e79 am: f93a7b709f -s ours am skip reason: subject contains skip directive Change-Id: Ibb252abaa924d807cfc967cb5ff8762519cdc15f