diff options
| author | Danielle Roberts <daroberts@google.com> | 2017-03-01 23:17:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-01 23:17:32 +0000 |
| commit | 86beba618939a5bf86e1ce9975b0a6643ebeff7a (patch) | |
| tree | 4935333794b1058c7ae8a098163e47096e48c88f | |
| parent | 4c9184cd64c6bae537af1df7cc030d7fbb648db3 (diff) | |
| parent | bab28d1487bb444107be4517ce44ceba1d8689da (diff) | |
| download | source.android.com-86beba618939a5bf86e1ce9975b0a6643ebeff7a.tar.gz | |
Merge "Docs: Add two researchers to 2016 acknowledgements"
| -rw-r--r-- | src/security/overview/acknowledgements.jd | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/security/overview/acknowledgements.jd b/src/security/overview/acknowledgements.jd index 3616b128..3ddbd62f 100644 --- a/src/security/overview/acknowledgements.jd +++ b/src/security/overview/acknowledgements.jd @@ -380,6 +380,8 @@ Fortinet's FortiGuard Labs</p> <p>Michał Bednarski (<a href="https://github.com/michalbednarski">github.com/michalbednarski</a>)</p> +<p>Mike Maarse</p> + <p>Min Chong of Android Security</p> <p>Mingjian Zhou (<a href="https://twitter.com/Mingjian_Zhou">@Mingjian_Zhou</a>) @@ -469,6 +471,8 @@ Telecommunications</a></p> <p>Tao (Lenx) Wei (韦韬) of Baidu X-Lab</p> +<p>Thom Does</p> + <p>Tieyan Li of Huawei</p> <p>Tim Strazzere (<a href="https://twitter.com/timstrazz">@timstrazz</a>) of |