| commit | 9320985df80d6b87e7d6ad871b56b46c9127901f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 15 18:46:30 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:46:30 2019 -0700 |
| tree | e17841a49d0a2d98710c7af7425ef52188f1e276 | |
| parent | 74cfee29986e37786b9a647a098a9e15a1c251ad [diff] | |
| parent | 774d28bfa4a21f8bac2ec571f0cacb1e9abaa4d0 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 05a41d3277 -s ours am: 96aeae38dc am: fb59b78cbf am: 774d28bfa4 -s ours am skip reason: subject contains skip directive Change-Id: I9a9ad1d7396ff0d6ef39ccfb03cd50161e61ea8a