OSDN Git Service

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage...
authorXin Li <delphij@google.com>
Sun, 8 Sep 2019 22:13:54 +0000 (15:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 8 Sep 2019 22:13:54 +0000 (15:13 -0700)
commitf724604a607e40c32c3960ec4a264081093039b8
tree2f2fb7413c31ceb258ac0d353002305d4531e4c4
parent26998687ba8d1fdfe28e616555f54b78f577d898
parent80aeabe0823b0f839cf6e945b8cb84308d6d2053
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 513558d983 -s ours am: 0484cc459d -s ours
am: 80aeabe082 -s ours
am skip reason: change_id Ibfac366eff7b1e63b2b6757d2600ef20f19e71a6 with SHA1 03d46b8ec2 is in history

Change-Id: I128cf1d3c3c1f29d58d30b3df1cfd12856d28fef