Merge "Fix a typo in genre mapping" into mnc-dev
tree: bff12cd9225c0cf80ef109af324a31cb4ee51dda
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml