OSDN Git Service

resolved conflicts for merge of c3d9645e to eclair-mr2
authorDan Bornstein <danfuzz@android.com>
Wed, 18 Nov 2009 00:27:02 +0000 (16:27 -0800)
committerDan Bornstein <danfuzz@android.com>
Wed, 18 Nov 2009 00:27:02 +0000 (16:27 -0800)
commit34ce59147ca68f81a36ab05533a90199147ef3c7
treef959b9d88267ac7e7967cc2cd3854a3f5371a162
parent0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9
parentc3d9645e29aeb124b39a0b7639767a5f1fead229
resolved conflicts for merge of c3d9645e to eclair-mr2