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