diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 10:09:49 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 10:09:49 -0700 |
| commit | 9b017f96679dd6459e2cf44734d8f1062cda2ac5 (patch) | |
| tree | ffcaecf5afa48dd665593470aee14b84e48a96e2 | |
| parent | 0bf14034d6d724cd426f65a8917988b5459251c8 (diff) | |
| parent | bbe9b53a4861616ad984382c3826defc58b995ae (diff) | |
| download | build-9b017f96679dd6459e2cf44734d8f1062cda2ac5.zip build-9b017f96679dd6459e2cf44734d8f1062cda2ac5.tar.gz build-9b017f96679dd6459e2cf44734d8f1062cda2ac5.tar.bz2 | |
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
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 86c8d81..db41f98 100644 --- 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=MOB30J +export BUILD_ID=MOB30M diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 721e5b4..e0c68cf 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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)" |