commit | ab6a1df7672a92070d3873e113bead67b9ac89a7 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:03:29 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:03:29 2019 -0700 |
tree | ab27e604ca4d92286f5e57054b073690fe90b13a | |
parent | ce5890fd3195ed50c4339646b52d8891f62b5624 [diff] | |
parent | 58887211df3586e692677c2242afb107fd47f37a [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: d528d7e695 -s ours am: 946ea70adb am: 58887211df Change-Id: I266b86cb277ad79a7bfdfbaa41f908cedc4fce76