OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13678cf
)
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
author
Zach Jang
<zachjang@google.com>
Fri, 18 Mar 2016 00:11:47 +0000
(17:11 -0700)
committer
The Android Automerger
<android-build@android.com>
Tue, 22 Mar 2016 22:57:30 +0000
(15:57 -0700)
- kernel updates with patches for CVE-2015-1805
b/
27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
Fix merge conflict to mnc-mr2-release w/ security string change to 2016-04-02
core/version_defaults.mk
patch
|
blob
|
history
diff --git
a/core/version_defaults.mk
b/core/version_defaults.mk
index
8cc6900
..
40ddfa0
100644
(file)
--- a/
core/version_defaults.mk
+++ b/
core/version_defaults.mk
@@
-103,7
+103,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-04-0
1
+ PLATFORM_SECURITY_PATCH := 2016-04-0
2
endif
ifeq "" "$(PLATFORM_BASE_OS)"