tree b24321ac17884be632351c22f458e3f75ece2aa2
parent 7d30431d0687e2c4f3b2de3a3362358fa74f460a
parent f369d20de18a25b4d6b7d65f811b9dc716ca3363
author Xin Li <delphij@google.com> 1633656000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656000 +0000

[automerger skipped] Merge Android 12 am: f369d20de1 -s ours

am skip reason: Merged-In I623d78b62308dec895c0fa15f38fedfc47d7013a with SHA-1 7d30431d06 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1847255

Change-Id: Iad2a226a1ad84334a11815a171e369d6851cb795