aboutsummaryrefslogtreecommitdiffhomepage
path: root/LICENSE
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2014-11-20 14:27:46 -0800
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2014-11-20 14:27:46 -0800
commit49bc8c09636ae61f9c685d121278c3738b9a809a (patch)
treec8a6a2699904a065657cd853ab8bdccdc5382c30 /LICENSE
parentaa8ef98a1f491ffe2824f6a067056962769550a5 (diff)
Add nano proto authors and update LICENSE file to include Android.mk.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index a15d52c1..f086efdb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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