| commit | cf157fdfdb207956ea2517005dd5f0b7ac29d229 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Jul 02 16:09:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 16:09:54 2019 -0700 |
| tree | edaeb61d341aa6a381f26b36880aa1a8180caa0c | |
| parent | 7cee827ab7d8c53d65481befb1432bbc127e10dc [diff] | |
| parent | fc4b7ce6c1541730d98ce84fa6fa6710de7023c0 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 6c480d7758 am: fc4b7ce6c1 -s ours am skip reason: subject contains skip directive Change-Id: I52e02bc687816e7c0ad45b6434e00a79e2dabfc0