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