commit 7e1ce27c08ec57032520613488ec2fe5b3795126
author Ed Heyl <edheyl@google.com> Thu Jan 20 18:08:34 2011 -0800
committer Ed Heyl <edheyl@google.com> Thu Jan 20 18:08:34 2011 -0800
tree d80193110ef570bdf2643e0c428b2f3e4974cfbe
parent 7dfc1270967c96be6dcd58fb7770c07482a7e90d
parent 50738779d90970a3e36fe40a78df724946f323db

Merge commit '50738779' into gingerbread-plus-aosp

Conflicts:
	core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 22c15ca..d4a429d 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 := AOSP
+  PLATFORM_VERSION := 2.3.3
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -96,4 +96,3 @@
   # anyone trying to parse it as an integer will probably get "0".
   BUILD_NUMBER := eng.$(USER).$(shell date +%Y%m%d.%H%M%S)
 endif
-