tree 006e5e617d5f0919fe26ed3f229d2ef3e2052640
parent 5729dbfa00ffb659c5758195b617af4349c0ef75
parent 25a331ab870edcf31dbbfab0a9e6f4cef88654f5
author Ed Heyl <edheyl@google.com> 1264546877 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264546877 -0800

am 25a331ab: Merge "Update version string." into eclair

Merge commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp

* commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
  Update version string.