OSDN Git Service

am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair
authorEric Fischer <enf@google.com>
Tue, 17 Nov 2009 04:01:38 +0000 (20:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Nov 2009 04:01:38 +0000 (20:01 -0800)
commitdd0279d592788cfa0d88398c0d946c34a3affa37
treea724a2280d50653128b0284f9cef212906062fb0
parent37c35377fbcc31ffcb1851b234256687ba465a11
parent95b2e5f9505a995ce293339fab44c9ec7f7866ea
am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair

Merge commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea' into eclair-mr2-plus-aosp

* commit '95b2e5f9505a995ce293339fab44c9ec7f7866ea':