OSDN Git Service

am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT...
authorYing Wang <wangying@google.com>
Tue, 29 Jun 2010 16:28:56 +0000 (09:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Jun 2010 16:28:56 +0000 (09:28 -0700)
commitdd2c21550c6a31493b4c1d0a01451a88a8747b35
tree140e1e8ce3985249344b08b4ba8eb6bbb9ed08d1
parenta7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3
parent0af605f3b6e759f480a5124dc6b338ec58e1d40c
am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread

* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
core/definitions.mk