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

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