diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-20 14:27:46 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-20 14:27:46 -0800 |
| commit | 49bc8c09636ae61f9c685d121278c3738b9a809a (patch) | |
| tree | c8a6a2699904a065657cd853ab8bdccdc5382c30 | |
| parent | aa8ef98a1f491ffe2824f6a067056962769550a5 (diff) | |
Add nano proto authors and update LICENSE file to include Android.mk.
| -rw-r--r-- | CONTRIBUTORS.txt | 6 | ||||
| -rw-r--r-- | LICENSE | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 4a804a09..b8d97fc2 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -17,6 +17,12 @@ Proto2 Python primary authors: Will Robinson <robinson@google.com> Petar Petrov <petar@google.com> +Java Nano primary authors: + Brian Duff <bduff@google.com> + Tom Chao <chaot@google.com> + Max Cai <maxtroy@google.com> + Ulas Kirazci <ulas@google.com> + Large code contributions: Jason Hsueh <jasonh@google.com> Joseph Schorr <jschorr@google.com> @@ -8,6 +8,8 @@ This license applies to all parts of Protocol Buffers except the following: src/google/protobuf/stubs/atomicops_internals_aix.h. This file is copyrighted by Bloomberg Finance LP. + - Andorid.mk, which is copyrighted by The Android Open Source Project. + Copyright 2014, Google Inc. All rights reserved. Redistribution and use in source and binary forms, with or without |