am e35cd5f5: (-s ours) am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread

Merge commit 'e35cd5f569fe760385198f485e4610ad13033dd3'

* commit 'e35cd5f569fe760385198f485e4610ad13033dd3':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
tree: 60e01d1b54244b5da6a07286d5794b6fb7346442
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE