diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 13:17:17 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 13:17:17 -0700 |
| commit | 7b16908add24102b5c3aa36b1062075c1c67e088 (patch) | |
| tree | 984a510d53aa310cc56b3f673e499aa484900a88 | |
| parent | ba31c2695aa7c81a930059976f2dacffb84f1cb0 (diff) | |
| parent | c00b2e72aa21fd862c814c33722674113e0c6d9b (diff) | |
| download | build-7b16908add24102b5c3aa36b1062075c1c67e088.zip build-7b16908add24102b5c3aa36b1062075c1c67e088.tar.gz build-7b16908add24102b5c3aa36b1062075c1c67e088.tar.bz2 | |
Merge tag 'android-6.0.1_r72' into HEAD
Android 6.0.1 Release 72 (M4B30X)
Change-Id: Ida42e8942cf7ed3d69ac6cdf9fc70a0098c3b259
| -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 8ae4c9c..e6bb0d7 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=MOB31E +export BUILD_ID=M4B30X diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e6cd11b..558a035 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-09-06 + PLATFORM_SECURITY_PATCH := 2016-10-05 endif ifeq "" "$(PLATFORM_BASE_OS)" |