am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls...
am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread
Merge commit 'd5aaff54' into gingerbread-plus-aosp
* commit 'd5aaff54':
DO NOT MERGE - Updated media playback transport controls (b/3116268)