tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent d823bb595456b742793e10262f7e0f84041810c9
parent 67012670f8d44b730d26ea5f9863b71eda23f5cb
author Xin Li <delphij@google.com> 1584729919 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584729919 +0000

[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 58d082ff97 -s ours am: 67012670f8

Change-Id: I74f2963df26fc0bc195b2b52652c04ada7ca74e6