tree 6d405b3b9e1caf9c843eb0ceef69fbfd23d3b170
parent b56dd5cb102985114b8e325e85e14dd5227ae318
parent 3620a9cc21a7c6d7cb15c1f3e030c26415cb5414
author Xin Li <delphij@google.com> 1568236203 -0700
committer android-build-merger <android-build-merger@google.com> 1568236203 -0700

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 3620a9cc21 -s ours
am skip reason: change_id Idf5a1366c365b45a542eb63e110f32c5c1a662ce with SHA1 8acb6df218 is in history

Change-Id: I24a804d69090cd3b463e7504441413bc785bffb1