am dd2c2155: am 0af605f3: Merge "Allow to override --version-code and...
am dd2c2155: am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit 'dd2c2155' into gingerbread-plus-aosp
* commit 'dd2c2155':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS