aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2015-03-20 23:14:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 23:14:51 +0000
commit1f4d0f941c22604572b2ec3217fe46f3570436b0 (patch)
tree298bf379e2d05489ab6d5907221d22778bb1e885 /src
parent1d2342000cdeac544811cb984d2aacd15c16d4e3 (diff)
parent31111e302e14330c3868e6b1456dbe1e0293edef (diff)
downloadexternal_protobuf-1f4d0f941c22604572b2ec3217fe46f3570436b0.zip
external_protobuf-1f4d0f941c22604572b2ec3217fe46f3570436b0.tar.gz
external_protobuf-1f4d0f941c22604572b2ec3217fe46f3570436b0.tar.bz2
am 31111e30: am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit '31111e302e14330c3868e6b1456dbe1e0293edef':
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions