Merge changes Iee17fa80,Id9ee50be into lmp-dev

* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
  [DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev
This commit is contained in:
Adam Seaton 2017-04-12 22:50:45 +00:00 committed by Android (Google) Code Review
commit 9e63540d01

View file

@ -75,7 +75,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-05-05
PLATFORM_SECURITY_PATCH := 2017-06-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"