[automerger skipped] Merge "mediaswcodec: Set "default" as preferred service" am: 124176d86b
-s ours
am skip reason: Change-Id Iebcd89bfa38de3c10b79f878462ba2af347ad332 with SHA-1 0c16dbe690
is in history
Change-Id: Ibb450d7e5a63d907ff28fdeb26a4c97687e741a9
gugelfrei
commit
bd14792a21