resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602

diff --cc Command.cpp
Simple merge

diff --cc Package.cpp
Simple merge

diff --cc Resource.cpp
index 1724c8c99fc7e950b15842f8d016fb1612942637,5152d3b5ed3fd4879b952f5af0ca34a6b18b45aa..2d5138bab3fa9997496e2a08491f7093c4ed4057
--- 1/Resource.cpp
--- 2/Resource.cpp
+++ b/Resource.cpp
@@@ -291,20 -294,21 +295,21 @@@ static status_t makeFileResources(Bundl
  }
  
  static status_t preProcessImages(Bundle* bundle, const sp<AaptAssets>& assets,
 -                          const sp<ResourceTypeSet>& set)
 +                          const sp<ResourceTypeSet>& set, const char* type)
  {
-     ResourceDirIterator it(set, String8(type));
-     Vector<sp<AaptFile> > newNameFiles;
-     Vector<String8> newNamePaths;
      bool hasErrors = false;
-     ssize_t res;
-     while ((res=it.next()) == NO_ERROR) {
-         res = preProcessImage(bundle, assets, it.getFile(), NULL);
-         if (res < NO_ERROR) {
-             hasErrors = true;
+     ssize_t res = NO_ERROR;
+     if (bundle->getUseCrunchCache() == false) {
 -        ResourceDirIterator it(set, String8("drawable"));
++        ResourceDirIterator it(set, String8(type));
+         Vector<sp<AaptFile> > newNameFiles;
+         Vector<String8> newNamePaths;
+         while ((res=it.next()) == NO_ERROR) {
+             res = preProcessImage(bundle, assets, it.getFile(), NULL);
+             if (res < NO_ERROR) {
+                 hasErrors = true;
+             }
          }
      }
- 
      return (hasErrors || (res < NO_ERROR)) ? UNKNOWN_ERROR : NO_ERROR;
  }