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 21:52:48 +0000 (14:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 8 Sep 2019 21:52:48 +0000 (14:52 -0700)
commit80aeabe0823b0f839cf6e945b8cb84308d6d2053
tree2f2fb7413c31ceb258ac0d353002305d4531e4c4
parent4b8c5e40430e2adfbfd9633008c480a51e6b04ea
parent0484cc459df7ff6da15640c36ade948a3a3ae1fb
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 513558d983 -s ours
am: 0484cc459d -s ours
am skip reason: change_id Ibfac366eff7b1e63b2b6757d2600ef20f19e71a6 with SHA1 03d46b8ec2 is in history

Change-Id: I774dc301a4868b98f5cd4858b52cf7e0b1ebb327