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

Merge commit 'a747b4399300beae712dacdf189f10e91b3623a0'

* commit 'a747b4399300beae712dacdf189f10e91b3623a0':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)