Docs: Update security acknowledgements
Bug: 26497346
Change-Id: Ic8272a3e207a4269899801c6d7713ef964a95f8c
diff --git a/src/security/bulletin/2015-10-01.jd b/src/security/bulletin/2015-10-01.jd
index 2a7f682..e7f4143 100644
--- a/src/security/bulletin/2015-10-01.jd
+++ b/src/security/bulletin/2015-10-01.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2015 The Android Open Source Project
+ Copyright 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -178,8 +178,8 @@
<ul>
<li> Brennan Lautner: CVE-2015-3863
- <li> Yajin Zhou, Lei Wu, and Xuxian Jiang of C0re Team from Qihoo 360: CVE-2015-3868,
-CVE-2015-3869, CVE-2015-3865, CVE-2015-3862
+ <li> Chiachih Wu and Xuxian Jiang of C0RE Team from Qihoo 360: CVE-2015-3868, CVE-2015-3869, CVE-2015-3862
+ <li> Yajin Zhou, Lei Wu, and Xuxian Jiang of C0RE Team from Qihoo 360: CVE-2015-3865
<li> Daniel Micay ([email protected]) at Copperhead Security: CVE-2015-3875
<li> dragonltx of Alibaba Mobile Security Team: CVE-2015-6599
<li> Ian Beer and Steven Vittitoe of Google Project Zero: CVE-2015-6604
diff --git a/src/security/overview/acknowledgements.jd b/src/security/overview/acknowledgements.jd
index 6efa170..22eb8a8 100644
--- a/src/security/overview/acknowledgements.jd
+++ b/src/security/overview/acknowledgements.jd
@@ -34,31 +34,130 @@
for the <a href="https://www.google.com/about/appsecurity/patch-rewards/">Patch
Rewards</a> program.</p>
-<h2 id=2015>2015</h2>
+<h2 id=2016>2016</h2>
<div style="LINE-HEIGHT:25px;">
-<p>
-<a href="mailto:[email protected]">jgor</a> of <a href="http://security.utexas.edu">The University of Texas at Austin</a> (<a href="https://twitter.com/indiecom">@indiecom</a>)
-</p>
+<p>Abhishek Arya of Google Chrome Security Team</p>
-<p><a href="mailto:[email protected]">Guang Gong</a> of <a href="http://www.360safe.com/">Qihoo 360 Technology Co. Ltd</a> (<a href="https://twitter.com/oldfresher">@oldfresher</a>)</p>
+<p>Gal Beniamini (<a href="https://twitter.com/@laginimaineb">@laginimaineb</a>, <a href="http://bits-please.blogspot.com/">http://bits-please.blogspot.com</a>)</p>
-<p>Stephan Huber of Testlab Mobile Security, <a
-href="https://www.sit.fraunhofer.de/">Fraunhofer SIT</a> (<a
-href="mailto:[email protected]">[email protected]</a>)
-</p>
+<p>Jann Horn (<a href="https://thejh.net/">https://thejh.net</a>)</p>
-<p><a
-href="http://www.ec-spride.tu-darmstadt.de/en/research-groups/secure-software-engineering-group/staff/siegfried-rasthofer/">Siegfried
-Rasthofer</a> of <a href="http://sseblog.ec-spride.de/">Secure Software
-Engineering Group</a>, EC SPRIDE Technische Universität Darmstadt (<a
-href="mailto:[email protected]">[email protected]</a>)</p>
+<p>jfang of KEEN lab, Tencent (<a href="https://twitter.com/k33nteam">@K33nTeam</a>)</p>
-<p><a href="mailto:[email protected]">Gal Beniamini</a> (<a href="http://bits-please.blogspot.com">http://bits-please.blogspot.com</a>)</p>
+<p>Jouni Malinen PGP id EFC895FA</p>
-<p>Michael Peck of <a href="https://www.mitre.org">The MITRE Corporation</a>
-(<a href="mailto:[email protected]">[email protected]</a>)</p>
+<p>Martin Barbella of Google Chrome Security Team</p>
+
+<p>Oliver Chang of Google Chrome Security Team</p>
+
+<p>Quan Nguyen of Google Information Security Engineer Team</p>
+
+<p>Sen Nie (<a href="https://twitter.com/@nforest_">@nforest_</a>) of KEEN lab, Tencent (<a href="https://twitter.com/k33nteam">@K33nTeam</a>)</p>
+
+<p>Tom Craig of Google X</p>
+
+<p>Yabin Cui from Android Bionic Team</p>
+
+</div>
+
+<h2 id=2015>2015</h2>
+
+<div style="LINE-HEIGHT:25px;">
+<p>Abhishek Arya, Google Chrome Security Team</p>
+
+<p>Alex Copot</p>
+
+<p>Alex Eubanks</p>
+
+<p>Alexandru Blanda</p>
+
+<p>Artem Chaykin</p>
+
+<p>Ben Hawkes</p>
+
+<p>Brennan Lautner</p>
+
+<p>Chiachih Wu of C0RE Team from Qihoo 360</p>
+
+<p>Darmstadt ([email protected])</p>
+
+<p>Daniel Micay ([email protected]) at Copperhead Security</p>
+
+<p>Dongkwan Kim of System Security Lab, KAIST ([email protected])</p>
+
+<p>dragonltx of Alibaba Mobile Security Team</p>
+
+<p>Gal Beniamini (<a href="http://bits-please.blogspot.com/">http://bits-please.blogspot.com</a>)</p>
+
+<p>Guang Gong (龚广) (<a href="https://twitter.com/oldfresher">@oldfresher</a>, [email protected]) of <a href="http://www.360.cn/">Qihoo 360 Technology Co.Ltd</a></p>
+
+<p>Hongil Kim of System Security Lab, KAIST ([email protected])</p>
+
+<p>Ian Beer of Google Project Zero</p>
+
+<p>Iván Arce (@4Dgifts) of Programa STIC at Fundación Dr. Manuel Sadosky, Buenos
+Aires Argentina</p>
+
+<p>Jack Tang of Trend Micro (@jacktang310)</p>
+
+<p>jgor of <a href="http://security.utexas.edu/">The University of Texas at Austin</a> (<a href="https://twitter.com/indiecom">@indiecom</a>)</p>
+
+<p>Joaquín Rinaudo (@xeroxnir) of Programa STIC at Fundación Dr. Manuel Sadosky,
+Buenos Aires Argentina</p>
+
+<p>Jordan Gruskovnjak of Exodus Intelligence (@jgrusko)</p>
+
+<p>Joshua Drake of Zimperium</p>
+
+<p>Lei Wu of C0RE Team from Qihoo 360</p>
+
+<p>Marco Grassi (<a href="https://twitter.com/marcograss">@marcograss</a>) of <a href="http://k33nteam.org/">KeenTeam</a> (<a href="https://twitter.com/k33nteam">@K33nTeam</a>)</p>
+
+<p>Mark Carter (<a href="https://twitter.com/hanpingchinese">@hanpingchinese</a>) of EmberMitre Ltd</p>
+
+<p>Martin Barbella, Google Chrome Security Team</p>
+
+<p>Michael Peck of <a href="https://www.mitre.org/">The MITRE Corporation</a> ([email protected])</p>
+
+<p>Michał Bednarski (<a href="https://github.com/michalbednarski">https://github.com/michalbednarski</a>)</p>
+
+<p>Michael Roland of JR-Center u'smile at University of Applied Scienses, Upper
+Austria/Hagenberg</p>
+
+<p>Natalie Silvanovich of Google Project Zero</p>
+
+<p>Oliver Chang, Google Chrome Security Team</p>
+
+<p>Peter Pi of Trend Micro</p>
+
+<p>Ping Li of Qihoo 360 Technology Co. Ltd</p>
+
+<p>Qidan He (@flanker_hqd) from KeenTeam (@K33nTeam, <a href="http://k33nteam.org/">http://k33nteam.org/</a>)</p>
+
+<p>Roee Hay and Or Peles</p>
+
+<p>Seven Shen of Trend Micro</p>
+
+<p><a href="http://www.ec-spride.tu-darmstadt.de/en/research-groups/secure-software-engineering-group/staff/siegfried-rasthofer/">Siegfried Rasthofer</a> of <a href="http://sseblog.ec-spride.de/">Secure Software Engineering Group</a>, EC SPRIDE Technische Universität</p>
+
+<p>Stephan Huber of Testlab Mobile Security, <a href="https://www.sit.fraunhofer.de/">Fraunhofer SIT</a> ([email protected])</p>
+
+<p>Steven Vittitoe of Google Project Zero</p>
+
+<p>Tzu-Yin (Nina) Tai</p>
+
+<p>Wangtao(neobyte) of Baidu X-Team</p>
+
+<p>Wen Xu (@antlr7) from KeenTeam (@K33nTeam, <a href="http://k33nteam.org/">http://k33nteam.org/</a>)</p>
+
+<p>Wish Wu of Trend Micro Inc. (@wish_wu)</p>
+
+<p>Xuxian Jiang of C0RE Team from Qihoo 360</p>
+
+<p>Yajin Zhou of C0RE Team from Qihoo 360</p>
+
</div>
