diff options
| author | Danielle Roberts <daroberts@google.com> | 2017-03-01 23:31:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-01 23:31:06 +0000 |
| commit | adb7cc75a08019ab6b367d07a93a1c3582f2d044 (patch) | |
| tree | 312c54c0b7667e6d667372d49c30c07fdbb27a42 | |
| parent | 40c18e749ce19c6664963ba758d9ccf7418434c3 (diff) | |
| parent | 2990931ca3337618c48ebce3cc6b6b619248861c (diff) | |
| download | source.android.com-adb7cc75a08019ab6b367d07a93a1c3582f2d044.tar.gz | |
Merge "Docs: Add two researchers to 2016 acknowledgements" am: 86beba6189
am: 2990931ca3
Change-Id: I2b08d73628e09ad44ad86a6bb75ee692af4f2c18
| -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 |