Merge "Revert "Ship Music2, not Music""
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 39e3ece..d999552 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -33,7 +33,7 @@
     Keyguard \
     LatinIME \
     Launcher2 \
-    Music2 \
+    Music \
     MusicFX \
     OneTimeInitializer \
     PrintSpooler \