commit abc791fc5723bee48763a67a497ae25ac203b65b
author Chris Wren <cwren@android.com> Mon Dec 03 17:56:51 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 17:56:51 2012 -0800
tree 905f2bf18e57b990f4fa840ba746dab7e349cd2f
parent d2e4c25e3f102249758915da7c24c47782df003b
parent 801a079269d78e29c105462518dd4876dd031b2e

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

* commit '801a079269d78e29c105462518dd4876dd031b2e':
  unbundle photo dreams into the GalleryGoogle package

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index 3e3e578..ca2101b 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 2c24b1a..b2e3189 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -37,7 +37,8 @@
     MagicSmokeWallpapers \
     NoiseField \
     PhaseBeam \
-    VisualizationWallpapers
+    VisualizationWallpapers \
+    PhotoTable
 
 # Additional settings used in all AOSP builds
 PRODUCT_PROPERTY_OVERRIDES := \