Merge tag 'android-7.1.2_r29' into cm-14.1

Android 7.1.2 Release 29 (NJH47F)

# gpg: Signature made Fri 28 Jul 2017 01:55:54 PM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

diff --git a/core/build_id.mk b/core/build_id.mk
index 131d235..35b5a1b 100644 (file)
--- 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=NJH47D
+export BUILD_ID=NJH47F

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 369ca90..7c96344 100644 (file)
--- 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-07-05
+    PLATFORM_SECURITY_PATCH := 2017-08-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"