OSDN Git Service

am 22dc40b6: (-s ours) am ca3a6dc4: am 45011f2d: (-s ours) Merge change I4e9fe62b...
authorCary Clark <cary@android.com>
Fri, 6 Nov 2009 19:46:39 +0000 (11:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Nov 2009 19:46:39 +0000 (11:46 -0800)
commit6066aac612184969eff0a7f4f1d6e12d0e690a52
treebd004e83be63ca14fdbacb3f2433dc04fcb6893d
parent4f2a1f56796bd454c7b6a1fc5cdd29af67933871
parent22dc40b6c3c1a9951fa17d80bf1f624bc29f5542
am 22dc40b6: (-s ours) am ca3a6dc4: am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair

Merge commit '22dc40b6c3c1a9951fa17d80bf1f624bc29f5542'

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