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

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

* commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
  Update version string.