commit | 18fa5eca5cb1ed890e3885a13e6dc9f57f48f69c | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 12:48:46 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 12:48:46 2019 -0700 |
tree | b01cc50823a1732e88eff92b98b201508b8a15a9 | |
parent | c22f012395ab48fc9a18edf162c755cec9cc8d5b [diff] | |
parent | 0b24d97ba66217f2a2fee0f46dbe49c6387fdb49 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 8a2edf737c -s ours am: b9435341b5 am: 0b24d97ba6 -s ours am skip reason: subject contains skip directive Change-Id: Ieea5a3b1ceda132b6c4a0beeb2cd69eb03d38ffe