Merge "Set correct view to display playback error text" into mnc-dev
tree: b55fbd3759f4ac28d884db51a2af7cf5c47464ac
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags