tree 433e66b6b801c459f4f3a1e474bb8f282e7f51f7
parent f9506a4677a6a7f960107759a8a9594d648b00ae
parent dc71887f835af9893177e2956a60dcc0097104cf
author Xin Li <delphij@google.com> 1586490861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586490861 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83

Change-Id: I1aaea8710cc2f46602d1543c6c7f304eb79a112c