Permalink
Browse files

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

Android 7.1.2 Release 12 (N2G47W)
  • Loading branch information...
akhilnarang committed Jun 8, 2017
2 parents 6356cd2 + a6d4f1f commit d5feb09514ee91b51c16e00fb07831fbcd78c4ef
Showing with 2 additions and 2 deletions.
  1. +1 −1 core/build_id.mk
  2. +1 −1 core/version_defaults.mk
View
@@ -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
View
@@ -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)"

0 comments on commit d5feb09

Please sign in to comment.