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

Commit 9b017f96 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r46' into HEAD 

Android 6.0.1 release 46

# gpg: Signature made Mon 06 Jun 2016 10:37:05 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
parents 0bf14034 bbe9b53a

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=MOB30J
 
export BUILD_ID=MOB30M

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-05-01

  PLATFORM_SECURITY_PATCH := 2016-06-01

endif



ifeq "" "$(PLATFORM_BASE_OS)"