am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt

diff --combined Command.cpp
index 990a7ea6c87d6e7e9586eb3f2aa672338ab58835,970a38152e8df0a39efe806f04111620785bb3c4..51af9650612e79557b61fdcfa518ea1f4e188b9d
--- 1/Command.cpp
--- 2/Command.cpp
+++ b/Command.cpp
@@@ -401,7 -401,7 +401,7 @@@ int doDump(Bundle* bundle
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -428,7 -428,7 +428,7 @@@
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -1152,7 -1152,12 +1152,12 @@@ int doPackage(Bundle* bundle
  
      // Write out R.java constants
      if (assets->getPackage() == assets->getSymbolsPrivatePackage()) {
-         err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+         if (bundle->getCustomPackage() == NULL) {
+             err = writeResourceSymbols(bundle, assets, assets->getPackage(), true);
+         } else {
+             const String8 customPkg(bundle->getCustomPackage());
+             err = writeResourceSymbols(bundle, assets, customPkg, true);
+         }
          if (err < 0) {
              goto bail;
          }