commit dba068e1ffffe9ac636e3d3e29793b6e3e855cbf
author Chris Wren <cwren@android.com> Mon Dec 03 18:01:14 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 18:01:14 2012 -0800
tree 6e73403ff172ab16da1d9d2a03b5e3c061dacbf6
parent 36d46e6e12c60d9f727957c4c556f035941b5c04
parent f28aae60adb462bba0cfe26ccf9ca80121ca1b7d

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

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

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index 9a19b3b..108e231 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -38,7 +38,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