am 833686e0: am f3ec8ad5: Merge "Rewrite of MediaPlayer logic." into mnc-dev

* commit '833686e01429efa3fae9b21745fd4ba668288acd':
  Rewrite of MediaPlayer logic.
tree: a6014b2672d81fbedcc39a6b69dd73b71e0c2e5d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags