diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:38:38 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:59:21 -0700 |
| commit | dc868512c37703ae19565ecfb05f5c4a8895f36d (patch) | |
| tree | 418a23e7c7ea051aed6f23cfc042cf6b1f3bbd60 | |
| parent | 457da7b65d39e23353551f98a3ee84dbbfdd5ace (diff) | |
| parent | f30ec8b29170894c4afda1fc4c20f267833865bc (diff) | |
| download | build-dc868512c37703ae19565ecfb05f5c4a8895f36d.zip build-dc868512c37703ae19565ecfb05f5c4a8895f36d.tar.gz build-dc868512c37703ae19565ecfb05f5c4a8895f36d.tar.bz2 | |
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)
Change-Id: Ie9c8bd51e3c1b06fa7d23f11739f9be137d224bb
| -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 28fdc2b..86c8d81 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=MOB30D +export BUILD_ID=MOB30J diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 40ddfa0..721e5b4 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-04-02 + PLATFORM_SECURITY_PATCH := 2016-05-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |