tree 55dbbc193dd153d0f3a23856eb9e45b7cf4400e6
parent 2a4b15a30f8b8ac70fb67b499249d49c1d5ea311
parent af1eb246ef691641e4c3a9039d8b85f4a705f402
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578362477 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578362477 +0000

[automerger skipped] Merge "SMS service loads MMS config directly instead" am: 250a41a139 am: e93312767b am: af1eb246ef -s ours
am skip reason: Change-Id Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e with SHA-1 44fb1904e3 is in history

Change-Id: I16d1d8f8306bca1d74baebceb695008247fbfc91