tree e0395eeef542f9798738fc338eb3d206ea3984b9
parent 8a38247576720dbd231dfa88da69538dd09decf3
parent 1f7cc85b8eefc86d05c01a3d200010d5ff19e6a2
author David Duarte <licorne@google.com> 1659018103 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659018103 +0000

Merge upstream commit '6029c0575763ef237440a9bb7447a922eecf47fb' into master am: 8b4d56f505 am: 2fe5b84081 am: 440eae6d5f am: 1f7cc85b8e

Original change: https://android-review.googlesource.com/c/platform/external/pandora/mmi2grpc/+/2168183

Change-Id: Ibf5b5aa95623bcd01925d8f6076ed41d197b17ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>