Merge "Fix not to launch MusicActivity directly"
am: efc6aa2c1f

Change-Id: Ie70f556b7ea5e222ccaed2c6a27b1d9e716698d5
tree: d526598327697d7fc283e943e1e8df53b77e504b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS