tree 097e164c18ad7a5e4902af0fdca520f764d8e897
parent cc6506581d4e2b137c4a8cad41faaf0703ab2d8f
parent d1284fad9898b650fec9ab70805b026092e6de8f
author Xin Li <delphij@google.com> 1599789782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789782 +0000

[automerger skipped] Merge Android R am: c5717db388 -s ours am: d1284fad98 -s ours

am skip reason: Change-Id I7b3ac42a06bef5906226d36604c4b4245dbe2007 with SHA-1 85c9b2a67c is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Messenger/+/1421954

Change-Id: I12a602d86e952870193ab4794409adca7358012f