Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d74e84f authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-7.0.0_r6' of https://android.googlesource.com/platform/build into cm-14.0 

Android 7.0.0 release 6

Change-Id: I1a346a5a04c5cd61dd1d0f01c1d80927f39fb8f3
parents adfe64a5 2e28f590

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=NRD90M
 
export BUILD_ID=NRD90U

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" 
  # Must be of the form "YYYY-MM-DD" on production devices.

  #

  # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

  PLATFORM_SECURITY_PATCH := 2016-08-05

  PLATFORM_SECURITY_PATCH := 2016-09-06

endif



ifeq "" "$(PLATFORM_BASE_OS)"