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

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