resolved conflicts for merge of 522c5ce2 to master

        "            en\n"

        "            port,en\n"

        "            port,land,en_US\n"

        "       If you put the special locale, zz_ZZ on the list, it will perform\n"

        "       pseudolocalization on the default locale, modifying all of the\n"

        "       strings so you can look for strings that missed the\n"

        "       internationalization process.  For example:\n"

        "            port,land,zz_ZZ\n"

        "   -d  one or more device assets to include, separated by commas\n"

        "   -f  force overwrite of existing files\n"

        "   -g  specify a pixel tolerance to force images to grayscale, default 0\n"

        "   -j  specify a jar or zip file containing classes to include\n"

        "   -k  junk path of file(s) added\n"

        "   -m  make package directories under location specified by -J\n"

#if 0

        "   -p  pseudolocalize the default configuration\n"

#endif

        "   -u  update existing packages (add new, replace older, remove deleted files)\n"

        "   -v  verbose output\n"

        "   -x  create extending (non-application) resource IDs\n"

        "       manifest, making the application debuggable even on production devices.\n"

        "   --include-meta-data\n"

        "       when used with \"dump badging\" also includes meta-data tags.\n"

        "   --pseudo-localize\n"

        "       generate resources for pseudo-locales (en-XA and ar-XB).\n"

        "   --min-sdk-version\n"

        "       inserts android:minSdkVersion in to manifest.  If the version is 7 or\n"

        "       higher, the default encoding for resources will be in UTF-8.\n"

                        goto bail;

                    }

                    gUserIgnoreAssets = argv[0];

                } else if (strcmp(cp, "-pseudo-localize") == 0) {

                    bundle.setPseudolocalize(PSEUDO_ACCENTED | PSEUDO_BIDI);

                } else {

                    fprintf(stderr, "ERROR: Unknown option '-%s'\n", cp);

                    wantUsage = true;