OSDN Git Service

am 26ab7084: am 07e1232a: resolved conflicts for merge of 90b35770 to eclair-mr2
authorDianne Hackborn <hackbod@google.com>
Thu, 19 Nov 2009 19:08:04 +0000 (11:08 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Nov 2009 19:08:04 +0000 (11:08 -0800)
commitee11f163846168c14de3e3c710cac2c57cdbbde1
tree16090337f81e17a860d2ce1dbacfc5fab6c44348
parent886332b8bedd9ce12ccf49920dbbac271cb44552
parent26ab7084b508d2052c3e4e62e9c6d0f7d08211d1
am 26ab7084: am 07e1232a: resolved conflicts for merge of 90b35770 to eclair-mr2

Merge commit '26ab7084b508d2052c3e4e62e9c6d0f7d08211d1'

* commit '26ab7084b508d2052c3e4e62e9c6d0f7d08211d1':
  Update version name to 2.1 and API to 7.
cleanspec.mk