am dd2c2155: am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35' into gingerbread-plus-aosp

* commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS