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

* commit '387a3a6fc57bfe069fbc93c646adb53f459619f6':
  Set correct view to display playback error text
tree: 153a6bc324735440755afb71cb95f4c410ab5cdc
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags