Merge "Ship Music2, not Music Bug: 9518830"

author Justin Ho <justinho@google.com>

Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)
author Justin Ho <justinho@google.com>
Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)
diff --cc target/product/generic_no_telephony.mk

index d999552,10d5483..39e3ece
--- 1/target/product/generic_no_telephony.mk
--- 2/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@@ -33,10 -33,9 +33,10 @@@ PRODUCT_PACKAGES := 
       Keyguard \
       LatinIME \
       Launcher2 \
-     Music \
+     Music2 \
       MusicFX \
       OneTimeInitializer \
+ +    PrintSpooler \
       Provision \
       Phone \
       QuickSearchBox \
author	Justin Ho <justinho@google.com>
	Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)