OSDN Git Service

resolved conflicts for merge of b5952289 to master
authorThe Android Automerger <android-build@android.com>
Mon, 24 Jan 2011 07:34:23 +0000 (23:34 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 24 Jan 2011 07:34:23 +0000 (23:34 -0800)
commit97f3f086224cc9bd804aa4c01d923f833d14f81c
treed4feae53e8dfb9de5bee18ccf9c5849821d05d93
parent7cc24409946e0d2f6a3d44ab44e9d2d192e945ef
parentb5952289e2dd0d84671881422a60df305193e964
resolved conflicts for merge of b5952289 to master

Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
core/version_defaults.mk