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

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