diff options
author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2016-01-19 11:05:09 -0800 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2016-01-22 14:46:43 -0800 |
commit | 5a9753fca56f0eeb9f61e342b2fccffc364f9426 (patch) | |
tree | dd33d82febff9fba67a61b711a30504b7f8a827b /libvpx/AUTHORS | |
parent | e8544063f08d093e211247d09d74e5bf86976dd5 (diff) | |
download | android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.tar.gz android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.tar.bz2 android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.zip |
Merge Conflict Fix CL to lmp-mr1-release for ag/849478
DO NOT MERGE - libvpx: Pull from upstream
Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06
BUG=23452792
Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec
Diffstat (limited to 'libvpx/AUTHORS')
-rw-r--r-- | libvpx/AUTHORS | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/libvpx/AUTHORS b/libvpx/AUTHORS index a9aa481..2f63d7c 100644 --- a/libvpx/AUTHORS +++ b/libvpx/AUTHORS @@ -3,10 +3,11 @@ Aaron Watry <awatry@gmail.com> Abo Talib Mahfoodh <ab.mahfoodh@gmail.com> +Adam Xu <adam@xuyaowu.com> Adrian Grange <agrange@google.com> Ahmad Sharif <asharif@google.com> Alexander Voronov <avoronov@graphics.cs.msu.ru> -Alex Converse <alex.converse@gmail.com> +Alex Converse <aconverse@google.com> Alexis Ballier <aballier@gentoo.org> Alok Ahuja <waveletcoeff@gmail.com> Alpha Lam <hclam@google.com> @@ -14,44 +15,58 @@ A.Mahfoodh <ab.mahfoodh@gmail.com> Ami Fischman <fischman@chromium.org> Andoni Morales Alastruey <ylatuya@gmail.com> Andres Mejia <mcitadel@gmail.com> +Andrew Russell <anrussell@google.com> Aron Rosenberg <arosenberg@logitech.com> Attila Nagy <attilanagy@google.com> changjun.yang <changjun.yang@intel.com> +Charles 'Buck' Krasic <ckrasic@google.com> chm <chm@rock-chips.com> Christian Duvivier <cduvivier@google.com> Daniel Kang <ddkang@google.com> Deb Mukherjee <debargha@google.com> +Dim Temp <dimtemp0@gmail.com> Dmitry Kovalev <dkovalev@google.com> Dragan Mrdjan <dmrdjan@mips.com> -Erik Niemeyer <erik.a.niemeyer@gmail.com> +Ehsan Akhgari <ehsan.akhgari@gmail.com> +Erik Niemeyer <erik.a.niemeyer@intel.com> Fabio Pedretti <fabio.ped@libero.it> Frank Galligan <fgalligan@google.com> Fredrik Söderquist <fs@opera.com> Fritz Koenig <frkoenig@google.com> Gaute Strokkenes <gaute.strokkenes@broadcom.com> Giuseppe Scrivano <gscrivano@gnu.org> +Gordana Cmiljanovic <gordana.cmiljanovic@imgtec.com> Guillaume Martres <gmartres@google.com> Guillermo Ballester Valor <gbvalor@gmail.com> Hangyu Kuang <hkuang@google.com> +Hanno Böck <hanno@hboeck.de> Henrik Lundin <hlundin@google.com> Hui Su <huisu@google.com> Ivan Maltz <ivanmaltz@google.com> +Jacek Caban <cjacek@gmail.com> +JackyChen <jackychen@google.com> James Berry <jamesberry@google.com> +James Yu <james.yu@linaro.org> James Zern <jzern@google.com> +Jan Gerber <j@mailb.org> Jan Kratochvil <jan.kratochvil@redhat.com> Janne Salonen <jsalonen@google.com> Jeff Faust <jfaust@google.com> Jeff Muizelaar <jmuizelaar@mozilla.com> Jeff Petkau <jpet@chromium.org> +Jia Jia <jia.jia@linaro.org> Jim Bankoski <jimbankoski@google.com> Jingning Han <jingning@google.com> +Joey Parrish <joeyparrish@google.com> Johann Koenig <johannkoenig@google.com> John Koleszar <jkoleszar@google.com> +John Stark <jhnstrk@gmail.com> Joshua Bleecher Snyder <josh@treelinelabs.com> Joshua Litt <joshualitt@google.com> Justin Clift <justin@salasaga.org> Justin Lebar <justin.lebar@gmail.com> KO Myung-Hun <komh@chollian.net> +Lawrence Velázquez <larryv@macports.org> Lou Quillio <louquillio@google.com> Luca Barbato <lu_zero@gentoo.org> Makoto Kato <makoto.kt@gmail.com> @@ -65,6 +80,7 @@ Michael Kohler <michaelkohler@live.com> Mike Frysinger <vapier@chromium.org> Mike Hommey <mhommey@mozilla.com> Mikhal Shemer <mikhal@google.com> +Minghai Shang <minghai@google.com> Morton Jonuschat <yabawock@gmail.com> Parag Salasakar <img.mips1@gmail.com> Pascal Massimino <pascal.massimino@gmail.com> @@ -72,6 +88,8 @@ Patrik Westin <patrik.westin@gmail.com> Paul Wilkins <paulwilkins@google.com> Pavol Rusnak <stick@gk2.sk> Paweł Hajdan <phajdan@google.com> +Pengchong Jin <pengchong@google.com> +Peter de Rivaz <peter.derivaz@gmail.com> Philip Jägenstedt <philipj@opera.com> Priit Laes <plaes@plaes.org> Rafael Ávila de Espíndola <rafael.espindola@gmail.com> @@ -79,22 +97,29 @@ Rafaël Carré <funman@videolan.org> Ralph Giles <giles@xiph.org> Rob Bradford <rob@linux.intel.com> Ronald S. Bultje <rbultje@google.com> +Rui Ueyama <ruiu@google.com> Sami Pietilä <samipietila@google.com> Scott Graham <scottmg@chromium.org> Scott LaVarnway <slavarnway@google.com> +Sean McGovern <gseanmcg@gmail.com> +Sergey Ulanov <sergeyu@chromium.org> Shimon Doodkin <helpmepro1@gmail.com> Stefan Holmer <holmer@google.com> Suman Sunkara <sunkaras@google.com> Taekhyun Kim <takim@nvidia.com> Takanori MATSUURA <t.matsuu@gmail.com> Tamar Levy <tamar.levy@intel.com> +Tao Bai <michaelbai@chromium.org> Tero Rintaluoma <teror@google.com> Thijs Vermeir <thijsvermeir@gmail.com> +Tim Kopp <tkopp@google.com> Timothy B. Terriberry <tterribe@xiph.org> Tom Finegan <tomfinegan@google.com> Vignesh Venkatasubramanian <vigneshv@google.com> Yaowu Xu <yaowu@google.com> +Yongzhe Wang <yongzhe@google.com> Yunqing Wang <yunqingwang@google.com> +Zoe Liu <zoeliu@google.com> Google Inc. The Mozilla Foundation The Xiph.Org Foundation |