tree 920c6536285e41b0992d2463803da8d297f1856e
parent 8d0bd75aa4d3588aba7f194433806b31486a7c87
parent cfcef3f0bb5de2d315f8db92367448e1dc37a5d2
author Xin Li <delphij@google.com> 1586547998 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586547998 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 21095c0a13 -s ours am: 6a806bf542 am: cfcef3f0bb

Change-Id: I2248bdfb30cd220abad97e80a24b7e81b3232025