commit ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0
author Ed Heyl <edheyl@google.com> Tue Jan 26 15:01:17 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 26 15:01:17 2010 -0800
tree 006e5e617d5f0919fe26ed3f229d2ef3e2052640
parent 5729dbfa00ffb659c5758195b617af4349c0ef75
parent 25a331ab870edcf31dbbfab0a9e6f4cef88654f5

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

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

* commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
  Update version string.

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 33d7761..9cc49c4 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
   # which is the version that we reveal to the end user.
   # Update this value when the platform version changes (rather
   # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 2.1
+  PLATFORM_VERSION := 2.1-update1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"