tree b91f80f99461d632c51bfc134376ab4a893587e0
parent 211832b6d3a5cd00ce8c92d064313d86d39410c7
parent 19d48030846f1842eac08706b2d3aa795cbe93e5
author Xin Li <delphij@google.com> 1586494462 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586494462 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d3ca045d6d -s ours am: b9e70d0cc3 am: 68fbeeb0dc am: 19d4803084 -s ours

am skip reason: subject contains skip directive

Change-Id: I4fb870761357fc1421f520c8a0934c5b77448d2c