OSDN Git Service

am ca3a6dc4: am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair
authorCary Clark <cary@android.com>
Fri, 6 Nov 2009 19:36:07 +0000 (11:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Nov 2009 19:36:07 +0000 (11:36 -0800)
commit22dc40b6c3c1a9951fa17d80bf1f624bc29f5542
tree765c90ef01f139daa60e9c37f6e5c78f338fe4ad
parent3c452e366001521b2ea07dcc2bd2aaa51c5ffd67
parentca3a6dc41418da152d154245c59054f7d0f0d679
am ca3a6dc4: am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair

Merge commit 'ca3a6dc41418da152d154245c59054f7d0f0d679' into eclair-mr2-plus-aosp

* commit 'ca3a6dc41418da152d154245c59054f7d0f0d679':
  do not merge -- original checkin to mr2 here: