commit f28aae60adb462bba0cfe26ccf9ca80121ca1b7d
author Chris Wren <cwren@android.com> Mon Dec 03 17:59:25 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 17:59:25 2012 -0800
tree 6568ce3f980efa2bee35092eaf880fe62bf52329
parent d3a561da10406b482107a052c9c60cf1be80e930
parent abc791fc5723bee48763a67a497ae25ac203b65b

am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev

* commit 'abc791fc5723bee48763a67a497ae25ac203b65b':
  unbundle photo dreams into the GalleryGoogle package

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index a7236f0..e10dc31 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -37,7 +37,6 @@
     KeyChain \
     MediaProvider \
     PackageInstaller \
-    PhotoTable \
     PicoTts \
     SettingsProvider \
     SharedStorageBackup \

target/product/full_base.mk

diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index ce8e63e..c28fd1b 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -37,7 +37,8 @@
     MagicSmokeWallpapers \
     NoiseField \
     PhaseBeam \
-    VisualizationWallpapers
+    VisualizationWallpapers \
+    PhotoTable
 
 include $(SRC_TARGET_DIR)/product/emulator.mk