am 86f3be75: Merge "Set correct view to display playback error text" into mnc-dev

* commit '86f3be750a91c31e52b85451e247b9c177e4f29e':
  Set correct view to display playback error text
tree: 25ae42ffcf466f05ee757a5be957075d375b3c31
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags