diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-12-10 04:27:10 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-12-10 04:27:10 +0100 |
commit | 309a2cc86bbd4c2cc6a975cabb7bc725734c4016 (patch) | |
tree | 9e33246b497b1ee3b36ea254f6471e685893f680 | |
parent | 171fb8b4f176f28cf02cdeca9e9bd75492ce1890 (diff) | |
parent | c174aa33f312c13f25b612b8ffffd6313ccf669a (diff) | |
download | build-309a2cc86bbd4c2cc6a975cabb7bc725734c4016.tar.gz build-309a2cc86bbd4c2cc6a975cabb7bc725734c4016.tar.bz2 build-309a2cc86bbd4c2cc6a975cabb7bc725734c4016.zip |
Merge remote-tracking branch 'lineage/cm-13.0' into replicant-6.0replicant-6.0-0003
-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 ca6a6c632..aea98e0a5 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=MOB31T +export BUILD_ID=MOI10E diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 49d2ca34a..5081bda0d 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2017-08-01 + PLATFORM_SECURITY_PATCH := 2017-11-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |