am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb...

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

diff --combined target/product/core.mk
index 3e3e578,1d62eb8..ca2101b
--- 1/target/product/core.mk
--- 2/target/product/core.mk
+++ b/target/product/core.mk
@@@ -37,7 -37,6 +37,6 @@@ PRODUCT_PACKAGES += 
      KeyChain \
      MediaProvider \
      PackageInstaller \
-     PhotoTable \
      PicoTts \
      SettingsProvider \
      SharedStorageBackup \
@@@ -134,6 -133,10 +133,6 @@@
      zoneinfo.idx \
      zoneinfo.version
  
 -PRODUCT_COPY_FILES += \
 -    system/core/rootdir/init.usb.rc:root/init.usb.rc \
 -    system/core/rootdir/init.trace.rc:root/init.trace.rc \
 -
  # host-only dependencies
  ifeq ($(WITH_HOST_DALVIK),true)
      PRODUCT_PACKAGES += \