Merge "Fix IllegalArgumentException for genre query" into lmp-dev
tree: 0b4a29015a977a1f81b3950bae5cf62bff1b986a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml