summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-22 14:34:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-22 14:34:54 -0700
commitcc6cf51b80eabd199f797f40b76f7980c343962b (patch)
tree1db1e94e54cec4da8d771afd1d802c72c21d3c2d /tools/aapt
parent8a0f63bb588138a9e4f1ef7830e94282efe57c6b (diff)
parent8c71784e9e83e914135e996591aa7903edd2fd96 (diff)
downloadframeworks_base-cc6cf51b80eabd199f797f40b76f7980c343962b.zip
frameworks_base-cc6cf51b80eabd199f797f40b76f7980c343962b.tar.gz
frameworks_base-cc6cf51b80eabd199f797f40b76f7980c343962b.tar.bz2
am 8c71784e: Merge "Initialize mJunkPath to false"
* commit '8c71784e9e83e914135e996591aa7903edd2fd96': Initialize mJunkPath to false
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Bundle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Bundle.h b/tools/aapt/Bundle.h
index d7cb61a..a5aa0b5 100644
--- a/tools/aapt/Bundle.h
+++ b/tools/aapt/Bundle.h
@@ -51,7 +51,7 @@ public:
mUpdate(false), mExtending(false),
mRequireLocalization(false), mPseudolocalize(false),
mWantUTF16(false), mValues(false),
- mCompressionMethod(0), mOutputAPKFile(NULL),
+ mCompressionMethod(0), mJunkPath(false), mOutputAPKFile(NULL),
mManifestPackageNameOverride(NULL), mInstrumentationPackageNameOverride(NULL),
mAutoAddOverlay(false), mGenDependencies(false),
mAssetSourceDir(NULL),