1. 016a86d resolved conflicts for merge of 5acd7e8d to ics-mr1-plus-aosp by Brian Muramatsu · 12 years ago
  2. 84746ad Fix MediaStubActivity Layout by Brian Muramatsu · 12 years ago
  3. d7e06ad Fix testVideoSurfaceResetting for Landscape by Brian Muramatsu · 12 years ago