tree ee6626e39c454a0e1076fc584e332801e79506f6
parent 4b7153b37306860bb8551e893293199bebb5781a
parent 27b772ae0028cc3749c56a0768dd39c2ce918a01
author Paul Scovanner <pscovanner@google.com> 1604603384 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604603384 +0000

[automerger skipped] resolve merge conflicts of 47ba91cd62e20c0f1d0e03ca1df6abb97c7c9cd9 to qt-qpr1-dev am: 952f59cccd -s ours am: 9d5a66feb3 am: 27b772ae00

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12992996

Change-Id: I54f1c78f6da99715748a28afe15b9e85184851da