tree 53e21d87416646402dabecaab28b227f84aa7aec
parent d3c85659cc285b290d7b16d762029902ccf3a557
parent 383e326bf0e920083bf523cc79400147fd986aab
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575401879 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1575401879 +0000

[automerger skipped] Merge changes I478f1d55,I39bb0916 into qt-qpr1-dev am: 383e326bf0 -s ours
am skip reason: Change-Id I478f1d558121e56e3d8bdeed4220eb8ba4ef097a with SHA-1 ee59f7184e is in history

Change-Id: I4f76c564249e17915a32d3ef5d13cee93112a461