tree b6da90ca55bae24fd37b98794843187ec9bd38b8
parent 247ba9029b7b8d9dc16af9c99f7d78ed493654c8
parent b00a71fc312c9781fa6f404dccfb55b062b2ccac
author Xin Li <delphij@google.com> 1586492023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586492023 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: a73922dd35 -s ours am: 3a2cb7a60d am: 7d8e09f32b am: b00a71fc31 -s ours

am skip reason: subject contains skip directive

Change-Id: I0764950d89c3c9098adec0ee5f75481d8267e708