Merge pull request #1 from CarbonDev/jb2-test

Jb2 test -merge
Octo-Kat · Feb 9, 2013 · 600dbe7 · 600dbe7
2 parents 87673d2 + de46cf4
commit 600dbe7
Show file tree

Hide file tree

Showing 27 changed files with 2 additions and 23 deletions.
diff --git a/config/common.mk b/config/common.mk
@@ -21,6 +21,7 @@ PRODUCT_PACKAGES += \
     LiveWallpapersPicker \
     NoiseField \
     PhaseBeam \
+    BlueBalls \
     Torch
 
 # prebuilts
@@ -29,7 +30,7 @@ PRODUCT_PACKAGES += \
     LatinIME \
     LockClock \
     NovaLauncher \
-    Performance \
+    PerformanceControl \
     Superuser
 
 # tools

diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_angel.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_angel.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_cool.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_cool.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_crying.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_crying.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_embarrassed.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_embarrassed.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_foot_in_mouth.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_foot_in_mouth.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_happy.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_happy.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_heart.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_heart.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_kissing.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_kissing.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_laughing.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_laughing.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_lips_are_sealed.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_lips_are_sealed.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_mad.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_mad.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_money_mouth.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_money_mouth.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_pokerface.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_pokerface.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_sad.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_sad.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_smirk.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_smirk.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_surprised.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_surprised.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_tongue_sticking_out.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_tongue_sticking_out.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_undecided.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_undecided.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_winking.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_winking.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_wtf.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_wtf.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_yelling.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/emo_im_yelling.png
diff --git a/overlay/common/packages/apps/Mms/res/drawable-xhdpi/ic_launcher_smsmms.png b/overlay/common/packages/apps/Mms/res/drawable-xhdpi/ic_launcher_smsmms.png
diff --git a/overlay/common/packages/apps/Mms/res/mipmap-xhdpi/ic_launcher_smsmms.png b/overlay/common/packages/apps/Mms/res/mipmap-xhdpi/ic_launcher_smsmms.png
diff --git a/proprietary/NovaLauncher/NovaLauncher.apk b/proprietary/NovaLauncher/NovaLauncher.apk
diff --git a/proprietary/Performance/Android.mk b/proprietary/Performance/Android.mk
diff --git a/proprietary/Performance/Performance.apk b/proprietary/Performance/Performance.apk