Merge tag 'android-7.1.2_r12' into nougat-mr2

Android 7.1.2 Release 12 (N2G47W)
AOSiP · Jun 8, 2017 · d5feb09 · d5feb09
2 parents 6356cd2 + a6d4f1f
commit d5feb09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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=N2G47O
+export BUILD_ID=N2G47X
diff --git 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-05-05
+      PLATFORM_SECURITY_PATCH := 2017-06-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"