summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-22 14:36:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-22 14:36:49 -0700
commitcee303fac4324d32e78e3d174e256f39d70d820f (patch)
tree69c8100ab55d4cd0990b21260a730dc5723b4d1b /tools
parent17f006ea92b802ddc63f36f0ea876cabca278eb7 (diff)
parentcc6cf51b80eabd199f797f40b76f7980c343962b (diff)
downloadframeworks_base-cee303fac4324d32e78e3d174e256f39d70d820f.zip
frameworks_base-cee303fac4324d32e78e3d174e256f39d70d820f.tar.gz
frameworks_base-cee303fac4324d32e78e3d174e256f39d70d820f.tar.bz2
am cc6cf51b: am 8c71784e: Merge "Initialize mJunkPath to false"
* commit 'cc6cf51b80eabd199f797f40b76f7980c343962b': Initialize mJunkPath to false
Diffstat (limited to 'tools')
-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),