diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 16:53:46 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 16:53:46 -0800 |
| commit | 705e90f0903eed0fa2ea92e80b8a5f3f09630cb0 (patch) | |
| tree | 039e85cfa373cbced5b95a8c89950012e95d1215 | |
| parent | 567d6aa43bf3e406c676ad3158a5ce3782d9fe9d (diff) | |
| parent | b42bdba5ad9ca27344b27abfd546c032f47c7754 (diff) | |
| download | replicant_build-705e90f0903eed0fa2ea92e80b8a5f3f09630cb0.zip replicant_build-705e90f0903eed0fa2ea92e80b8a5f3f09630cb0.tar.gz replicant_build-705e90f0903eed0fa2ea92e80b8a5f3f09630cb0.tar.bz2 | |
Merge tag 'android-6.0.1_r13' into HEAD
Android 6.0.1 release 13
Ticket: CYNGNOS-1522
| -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 16709e3..f55b184 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=MMB29T +export BUILD_ID=MMB29U diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 2939224..bf9b2e8 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-01-01 + PLATFORM_SECURITY_PATCH := 2016-02-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |