diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-28 12:24:57 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-28 12:24:57 +0000 |
| commit | 1d4caf3c77eed78e9b6fa1704c2c2bbfa80c2efa (patch) | |
| tree | bee7c7fb80612736a8b1c5280053da910c332d14 /core | |
| parent | 0596564ba7440918fa1a9d9018c940eba7de61af (diff) | |
| parent | d4382dd07eda339743aecd02c911431ffcdfff87 (diff) | |
| download | build-1d4caf3c77eed78e9b6fa1704c2c2bbfa80c2efa.zip build-1d4caf3c77eed78e9b6fa1704c2c2bbfa80c2efa.tar.gz build-1d4caf3c77eed78e9b6fa1704c2c2bbfa80c2efa.tar.bz2 | |
Merge commit 'android-4.2.1_r1' into HEAD
Diffstat (limited to 'core')
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 0713d42..bebcbfa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOP40C +export BUILD_ID=JOP40D diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 1162b78..fb1f361 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # 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 := 4.2 + PLATFORM_VERSION := 4.2.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" |