am f4b272c3: am 0cc59815: (-s ours) am 86f3be75: Merge "Set correct view to display playback error text" into mnc-dev

* commit 'f4b272c33ff58fc0f6507f75f19c3bfd906f7dce':
tree: 84230245b6d0620425180d5fab12ff558de999ab
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags