commit | c12cc6220827872868bd58d873090c778b95f2f2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 11:41:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 11:41:19 2019 -0700 |
tree | de53dae638eb5ebbda9010bc29ca6fa7c49f88e6 | |
parent | 7ed2100d0e1fda7e5cbaaa3bbb71af2f1d0df0c1 [diff] | |
parent | 59b1a2f6bb9d4c22320b146b5a1c7fa3432dedd0 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7 -s ours am: 59b1a2f6bb Change-Id: I4179542b8cf8fee2ee0002eabdcb47afdf51b054