Merge "Fix not to launch MusicActivity directly" am: efc6aa2c1f am: 82655c7f88
am: 8c4c73ef49

Change-Id: Ia5e3fd0def87e0b0730648d72f59bbc3c404d0cb
tree: 74663c9b873bf045eeca9bef759d35345e1cd383
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS