OSDN Git Service

[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924...
authorXin Li <delphij@google.com>
Tue, 2 Jul 2019 18:41:19 +0000 (11:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Jul 2019 18:41:19 +0000 (11:41 -0700)
commitc12cc6220827872868bd58d873090c778b95f2f2
treede53dae638eb5ebbda9010bc29ca6fa7c49f88e6
parent7ed2100d0e1fda7e5cbaaa3bbb71af2f1d0df0c1
parent59b1a2f6bb9d4c22320b146b5a1c7fa3432dedd0
[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