tree 29ab62d90a15df69c63cdf292037fc5675b7fb1d
parent fc8d2b50d67e779cf00df66192ea150333e9d6c5
parent cb7542be7f6870ab98d02ad6e571d5c6643e890a
author Xin Li <delphij@google.com> 1586489718 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586489718 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 16ae7719a9 -s ours am: c0b278b465 am: cb7542be7f

Change-Id: Idfd6b1f2b77abb29a8ae75083ebd97d3c7e4d9d2