commit | eea480c7962712d022c11de6f32f00c8509b33ab | [log] [tgz] |
---|---|---|
author | Michael Chan <mchan@android.com> | Wed Jan 06 15:49:55 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 06 15:49:55 2010 -0800 |
tree | 6be3c3768a1948e2e5887810667115550db84cdd | |
parent | 0ea48d08f749df8447f055458d708e7e97798469 [diff] | |
parent | d638a7cb0841184349edbec2c995a36e5719cb8c [diff] |
am d638a7cb: am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c' * commit 'd638a7cb0841184349edbec2c995a36e5719cb8c': b/2335545 Revert the dock strings back to "For Music and Media"