commit | 6e1c57a360ff0726f2058a4d89dfc1b0ef384144 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 14:24:20 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 14:24:20 2019 -0700 |
tree | de5ad2bb1b434b5049c177da5ae42ff1a86d5835 | |
parent | e94c3b2389b8333b1b2220b3bbfdbd3b91148e97 [diff] | |
parent | 9829d71c1032669df7bd43a5af48c1919fa9de19 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master am: ca4c520f19 -s ours am: 9829d71c10 Change-Id: Ic8ef53936a2a91dc915a5e5d967ef72be50ad15c