Sign in
android
/
platform
/
external
/
protobuf
/
refs/heads/idea133
commit
b6089cca5248f19832dde54faaad62891ff8bd25
[
log
]
author
The Android Open Source Project <initial-contribution@android.com>
Thu Dec 05 12:38:12 2013 -0800
committer
The Android Open Source Project <initial-contribution@android.com>
Thu Dec 05 12:38:12 2013 -0800
tree
e3f439f20eb72d01d921f98079d7710fcc0c88ad
parent
c4c4a562672068fb89ea4e65408dd53de2ed8f1f
[
diff
]
parent
0afd5a4d782037ea641d75d595cf5d38ed6978ac
[
diff
]
Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEAD
tree: e3f439f20eb72d01d921f98079d7710fcc0c88ad
android/
editors/
examples/
gtest/
java/
m4/
python/
src/
vsprojects/
.gitignore
aclocal.m4
Android.mk
autogen.sh
build.gradle
CHANGES.txt
CleanSpec.mk
config.guess
config.h.in
config.sub
configure
configure.ac
CONTRIBUTORS.txt
COPYING.txt
depcomp
generate_descriptor_proto.sh
install-sh
INSTALL.txt
ltmain.sh
Makefile.am
Makefile.in
missing
MODULE_LICENSE_BSD_LIKE
protobuf-lite.pc.in
protobuf.pc.in
README.android
README.txt