diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:01 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-03-07 18:12:01 -0800 |
| commit | 55d80653b950b21c974999595be4f80cf7e82229 (patch) | |
| tree | 9dcf2d130c879043194252ffdd31d54c5b8ea22a | |
| parent | 759f5733a769417fd41e21728b382d35afb59646 (diff) | |
| parent | 71a40f99584794672cc7e20d454821ec14537d31 (diff) | |
| download | build-55d80653b950b21c974999595be4f80cf7e82229.zip build-55d80653b950b21c974999595be4f80cf7e82229.tar.gz build-55d80653b950b21c974999595be4f80cf7e82229.tar.bz2 | |
Merge tag 'android-6.0.1_r17' into HEAD
Android 6.0.1 release 17
Ticket: CYNGNOS-1854
| -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 f55b184..e57fdb2 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=MMB29U +export BUILD_ID=MMB29V diff --git a/core/version_defaults.mk b/core/version_defaults.mk index bf9b2e8..be5833d 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-02-01 + PLATFORM_SECURITY_PATCH := 2016-03-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |