commit 8afbbabdfb7a846d88535f342296e23a72b1f108
author Clay Murphy <claym@google.com> Tue Mar 10 17:20:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 17:20:41 2015 +0000
tree ed8b249c77178ac1760a6e940735f2a98b8990c4
parent c4cff3b3dabb891be8420f6ebf737177f8196f16
parent 6d05e1b5b3f1eee8a6a33c5e32863aaa09e68381

am 6d05e1b5: Merge "Starting 2015"

* commit '6d05e1b5b3f1eee8a6a33c5e32863aaa09e68381':
  Starting 2015

src/devices/tech/security/overview/acknowledgements.jd

diff --git a/src/devices/tech/security/overview/acknowledgements.jd b/src/devices/tech/security/overview/acknowledgements.jd
index d773c9a..6fe71f8 100644
--- a/src/devices/tech/security/overview/acknowledgements.jd
+++ b/src/devices/tech/security/overview/acknowledgements.jd
@@ -24,6 +24,14 @@
 for the <a href="https://www.google.com/about/appsecurity/patch-rewards/">Patch
 Rewards</a> program.</p>
 
+<h2>2015</h2>
+
+<div style="LINE-HEIGHT:25px;">
+
+<p><a href="mailto:higongguang@gmail.com">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>
+
+</div>
+
 <h2>2014</h2>
 
 <div style="LINE-HEIGHT:25px;">