tree b9834a058062597f04465d222d99b0c4f1b80f18
parent 5e14945f12714eab770ff13ee5da3fb56712ddf5
parent a943dac26590e35c79fa4769b752aa627c531596
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579201310 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579201310 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: 8da97bddbd am: a943dac265 -s ours
am skip reason: subject contains skip directive

Change-Id: I774d536613e5cdaab0a7f0d8a0b2a9e2fabc8c3a