am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the dock strings back to...
am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair
Merge commit 'd638a7cb'
* commit 'd638a7cb':
b/2335545 Revert the dock strings back to "For Music and Media"