aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2017-05-01 23:24:41 (GMT)
committerDan Pasanen <dan.pasanen@gmail.com>2017-05-01 23:24:41 (GMT)
commita73f68a38cbd9c3d6ec7bf83b6ab8de43d3138a4 (patch)
treefa62018e53b77b3b484a247d012f600b3bb4894a
parentdd1d7caa6e7990678f52cf5b466895e2f7fb7ffa (diff)
parent72c9cf9ea858b1ad929a983ff88ec0220c71f692 (diff)
downloadandroid_build-staging/cm-14.1_android-7.1.2_r8.zip
android_build-staging/cm-14.1_android-7.1.2_r8.tar.gz
android_build-staging/cm-14.1_android-7.1.2_r8.tar.bz2
Merge tag 'android-7.1.2_r8' into cm-14.1staging/cm-14.1_android-7.1.2_r8
Android 7.1.2 release 8 # gpg: Signature made Mon 01 May 2017 10:38:02 AM CDT # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
-rw-r--r--core/build_id.mk2
-rw-r--r--core/version_defaults.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 05381ec..3fc513c 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=N2G47E
+export BUILD_ID=N2G47O
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 83ac470..a93dc31 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -131,7 +131,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# It must be of the form "YYYY-MM-DD" on production devices.
# 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-04-05
+ PLATFORM_SECURITY_PATCH := 2017-05-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"