tree 1c9ef987f3cffdcef7f394efce1e173bd47fff72
parent 411da877f4e502a6871424ae522f1caa6676fece
parent a1ec01f2c93e687a8df12af6892b5cbc2e61faa8
author Xin Li <delphij@google.com> 1624296175 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624296175 +0000

[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 97a6f96b45 -s ours am: 4a388d04f8 -s ours am: 285f0a0ebe -s ours am: a1ec01f2c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c9bff7185ff8f3063f22c04218691bad46dc73c