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)
tree: 098417931546946efcd3ae0cd964b2d743dc5d89
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE