tree 0ab2c9d0553008a7d24fc7c557e20a6361df03dd
parent b703be49bd0d1b2e81a0b82a6b8559871233064c
parent ac671c07e5363d9e34012d9619ce94194d1e29f2
author Xin Li <delphij@google.com> 1633679779 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679779 +0000

[automerger skipped] Merge Android 12 am: 4aa283fea9 -s ours am: ab0c80d400 -s ours am: ac671c07e5 -s ours

am skip reason: Merged-In If0a2b824f3f1d1e1052eda860e2a58106406118b with SHA-1 e5d76bb306 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Mms/+/1847390

Change-Id: I43b5a5a42c6c51412e02fe28248dfcc1a4a3ac5e