StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29

Browse Source 
am: cbf1e2cc94

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
This commit is contained in:
Zach Jang
2016-06-22 01:33:23 +00:00
committed by android-build-merger
parent bf5d08ecf4 cbf1e2cc94
commit 9fc3cf7ba2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/version_defaults.mk
View File

@@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# Can be an arbitrary string, but must be a single word. # Can be an arbitrary string, but must be a single word.
# #
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2016-07-05 PLATFORM_SECURITY_PATCH := 2016-08-05
endif endif
ifeq "" "$(PLATFORM_BASE_OS)" ifeq "" "$(PLATFORM_BASE_OS)"