p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db am: 1be6c69524 

am: 1f87a820ad

Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
This commit is contained in:
Zach Jang 2016-06-22 01:46:17 +00:00 committed by android-build-merger
parent 7112b50252 1f87a820ad
commit 113239bed6
1 changed files with 1 additions and 1 deletions

2
core/version_defaults.mk
View File

@ -113,7 +113,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# Must be of the form "YYYY-MM-DD" on production devices.
#
# 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)"