commit | 7968cefef2f1f1ec87d36f5113d526741b373cff | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 13:59:40 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 13:59:40 2019 -0700 |
tree | de5ad2bb1b434b5049c177da5ae42ff1a86d5835 | |
parent | 0a5a744df78d336601c2eec4e668f6ce8fb95696 [diff] | |
parent | 53f34559490512264d441935e4aa086ef5c70913 [diff] |
Merge "[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0172a23b1a -s ours am: 53f3455949 Change-Id: I64e5c4c3dadb3bb436ed138181a95c2607d9d947