tree b36dc83c3175ee21a0a3442078dc42a8fa3d3aba
parent 4485159643ad7ce1015219f09b5dec2d7d30959a
parent 059c27ce5aa6eab28868826c525307332c9923d1
author Xin Li <delphij@google.com> 1584743624 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584743624 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 530a08c526 -s ours am: 5de870be1d am: 059c27ce5a

Change-Id: I750dde1b97a631ccac5f64c545f09b4f9c1c531f