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