commit | 3f56bcf776fa97c5f387a34cbccb2915aabace8d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:48:23 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:48:23 2019 -0700 |
tree | a7b55376118488845a4df9a2996746eeb74ada30 | |
parent | 393923b2cf58cac5370485a5b7cfbcb504c75831 [diff] | |
parent | cf52221ba4a2171d79c96d19e37f2bf2afc7c8fd [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 1e1d3c8725 -s ours am: d545844400 am: c7a33bf6f4 am: cf52221ba4 -s ours am skip reason: subject contains skip directive Change-Id: Idcaa2bcba7fd94b8e8e29dc140e1a89b8c158a34