tree c4320be08fcea73329420d7b9eb019623aea5ebc
parent c94465bd6c4dd0279b8bcfd3f9c40f2d14d7c951
parent e35c3d3015085bcd23000e27e108dfc2c04beb62
author Xin Li <delphij@google.com> 1586492024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586492024 +0000

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 02d6e74ded -s ours am: 49b6696606 am: 7b2e67bca8 am: e35c3d3015 -s ours

am skip reason: subject contains skip directive

Change-Id: If14b4d653142e2d2088253e68763b2043aa86d0f