Add nano proto authors and update LICENSE file to include Android.mk.

This commit is contained in:
Feng Xiao 2014-11-20 14:27:46 -08:00
parent aa8ef98a1f
commit 49bc8c0963
2 changed files with 8 additions and 0 deletions

View File

@ -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>

View File

@ -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