From: Dianne Hackborn Date: Sat, 16 May 2009 04:15:37 +0000 (-0700) Subject: Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com... X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9753ece40a5044dca290c43f310752954e572fbc?hp=046f69f251cc2ec4db1f25bf39ce730ee8a66fa6 Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge --- diff --git a/Bundle.h b/Bundle.h index 216ece4..2eb7a1d 100644 --- a/Bundle.h +++ b/Bundle.h @@ -38,6 +38,8 @@ public: mAssetSourceDir(NULL), mAndroidManifestFile(NULL), mPublicOutputFile(NULL), mRClassDir(NULL), mResourceIntermediatesDir(NULL), + mMinSdkVersion(NULL), mTargetSdkVersion(NULL), mMaxSdkVersion(NULL), + mVersionCode(NULL), mVersionName(NULL), mArgc(0), mArgv(NULL) {} ~Bundle(void) {}