diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-03 23:25:24 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-03 23:25:24 +0000 |
| commit | 5cd236c279a16120cabc9e334285277f9e79f213 (patch) | |
| tree | cf0ca7f071cf654a9e9e5b04ca9116caa0d4a1fd /core | |
| parent | e3500ed557fbbc1b5b70854221ee2bf9f3a0e475 (diff) | |
| parent | f64b8f928b2dca293493b24fc1f092faa06b22a2 (diff) | |
| download | build-5cd236c279a16120cabc9e334285277f9e79f213.zip build-5cd236c279a16120cabc9e334285277f9e79f213.tar.gz build-5cd236c279a16120cabc9e334285277f9e79f213.tar.bz2 | |
Merge tag 'android-6.0.0_r5' into cm-13.0
Android 6.0.0 release 5
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 1758c95..aad477a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA58K +export BUILD_ID=MRA58V diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 9bb5a2c..a130799 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2015-10-01 + PLATFORM_SECURITY_PATCH := 2015-11-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |