commit cf740e61c738e5a7b274cc9663cdc377987cbbf6
author Zach Jang <zachjang@google.com> Tue Jul 19 13:20:45 2016 -0700
committer Adam Seaton <aseaton@google.com> Wed Jul 20 15:26:34 2016 -0700
tree 15a5bd6b08ecce38cdc3ac3199ea589582c97a86
parent 7e38eefc0c6413cf5810bb6e795484a36e44a732

Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA

b/30224278

Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d

Fixing Merge Conflict ag/1237712 directly into mnc-dr1.6-release

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f3b3120..ab943dd 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -73,7 +73,7 @@
   # 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-08-05
+  PLATFORM_SECURITY_PATCH := 2016-09-01
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"
@@ -97,22 +97,6 @@
   endif
 endif
 
-ifeq "" "$(PLATFORM_SECURITY_PATCH)"
-  # Used to indicate the security patch that has been applied to the device.
-  # 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-01
-endif
-
-ifeq "" "$(PLATFORM_BASE_OS)"
-  # Used to indicate the base os applied to the device.
-  # Can be an arbitrary string, but must be a single word.
-  #
-  # If there is no $PLATFORM_BASE_OS set, keep it empty.
-  PLATFORM_BASE_OS :=
-endif
-
 ifeq "" "$(BUILD_ID)"
   # Used to signify special builds.  E.g., branches and/or releases,
   # like "M5-RC7".  Can be an arbitrary string, but must be a single