tree eb51ad1887762f53219b9eae9c1d1215ca4795c5
parent 1040fd847a74f9cfaa68a164d5b1d0b7b237adc4
parent 52440ed9b6852f32b39dafdccef9e9837b76d8d9
author Xin Li <delphij@google.com> 1586490600 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586490600 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: fc08bca912 -s ours am: 8a6d156c3f am: 52440ed9b6

Change-Id: Ie7f5e6213541e2efe16461fe2848ed9fe165be13