resolve merge conflicts of 12db224
to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
This commit is contained in:
commit
0c672afc40
1 changed files with 1 additions and 1 deletions
|
@ -73,7 +73,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-07-05
|
||||
PLATFORM_SECURITY_PATCH := 2016-08-05
|
||||
endif
|
||||
|
||||
ifeq "" "$(PLATFORM_BASE_OS)"
|
||||
|
|
Loading…
Reference in a new issue