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

Commit d8c07e49 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r20' into HEAD 

Ticket: CYNGNOS-2213
Android 6.0.1 release 20
parents 3e50adae 772db683

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=MMB29V
 
export BUILD_ID=MMB29X

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" 
  # Can be an arbitrary string, but must be a single word.

  #

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

  PLATFORM_SECURITY_PATCH := 2016-03-01

  PLATFORM_SECURITY_PATCH := 2016-04-02

endif



ifeq "" "$(PLATFORM_BASE_OS)"