OSDN Git Service

am ffae6f51: (-s ours) am 25a331ab: Merge "Update version string." into eclair
authorEd Heyl <edheyl@google.com>
Thu, 28 Jan 2010 23:09:40 +0000 (15:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 Jan 2010 23:09:40 +0000 (15:09 -0800)
commitb46e8a2d5c97b9bbdd4f5ab4bf1fdf74af85079e
treebd2bb4784955cf6944e1226c404731424899f93b
parent80ec85cc47581c51d3bbba3fe59df058472ab020
parentffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0
am ffae6f51: (-s ours) am 25a331ab: Merge "Update version string." into eclair

Merge commit 'ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0'

* commit 'ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0':
  Update version string.