diff options
| author | Bill Yi <byi@google.com> | 2017-04-03 12:38:09 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2017-04-03 12:38:09 -0700 |
| commit | 32a816ce85a38514f581fe304884ea06fd6f38e9 (patch) | |
| tree | e7ed013ce4cf9be899376a75e1f964523f53788f | |
| parent | dfb6f45812e3d11092e90566989c05e0a57fde12 (diff) | |
| parent | 7ed86839dcc4ee92e8f158bc52340e919694c3c3 (diff) | |
| download | build-32a816ce85a38514f581fe304884ea06fd6f38e9.tar.gz | |
Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD
Change-Id: I71c4ee1f4cf1b4a2dc6df17218d4617b4cd22339
| -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 05229a90ef..548a9d7e6a 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=MOB31V +export BUILD_ID=MMB29X diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4cbade5f78..ffd15d4dcc 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2017-03-05 + PLATFORM_SECURITY_PATCH := 2017-04-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |