| commit | bdcf6589d1b4c6a9ae8f24f23761d56075bc51d2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 15 19:18:52 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 19:18:52 2019 -0700 |
| tree | af2ad3a6a20f863f8a55074f82c64c5999e8a2a1 | |
| parent | 0e9cfc7ed123dc9cf01c9f26ff20ca8ddcdc1621 [diff] | |
| parent | 9e20bd4d9e0f2a0b8535bf56e57c91207f8fe642 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: fa93b63879 -s ours am: 53712ca9ff am: f9701c093d am: 9e20bd4d9e -s ours am skip reason: subject contains skip directive Change-Id: I29a0d8a3362a7434d5da0daefb1794d352240d80