OSDN Git Service

am db08d5cd: (-s ours) DO NOT MERGE.
authorLeon Scroggins <scroggo@google.com>
Wed, 2 Dec 2009 13:25:12 +0000 (05:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 13:25:12 +0000 (05:25 -0800)
commit3e22f3c8664410fc29b4df61b81ef6c84ca3c16a
treeb7bd6938b8c20f41d994ddfa4518f1c345c96472
parentabb64629e2aab05af21153a1fa07192d55160999
parent87029dbc462479fd46ea3150567fdbdfbca94a85
am db08d5cd: (-s ours) DO NOT MERGE.

Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2

* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
  DO NOT MERGE.