diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:09 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-09-07 12:40:09 -0700 |
| commit | 07c1234af2b2ccb16ade799e4a755497bb28ed07 (patch) | |
| tree | eb5990faecfd237c951d3ae4ee121d548517aa6b | |
| parent | 3fa03d082e93a819e1f3226c02c3d4a8f7ea025a (diff) | |
| parent | 633dd52df80c38b16a55e070f69d6dc2f2714ca1 (diff) | |
| download | build-07c1234af2b2ccb16ade799e4a755497bb28ed07.zip build-07c1234af2b2ccb16ade799e4a755497bb28ed07.tar.gz build-07c1234af2b2ccb16ade799e4a755497bb28ed07.tar.bz2 | |
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:25:55 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 811f270..8ae4c9c 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=MOB30Z +export BUILD_ID=MOB31E diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d90f3dc..e6cd11b 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-08-05 + PLATFORM_SECURITY_PATCH := 2016-09-06 endif ifeq "" "$(PLATFORM_BASE_OS)" |