summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2014-08-21 02:47:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-21 02:47:37 +0000
commit31111e302e14330c3868e6b1456dbe1e0293edef (patch)
tree298bf379e2d05489ab6d5907221d22778bb1e885
parent6a8d85c1211dd2382df6991db27872de8d990948 (diff)
parentdad271e9a19fe98c4dd987ee5398b316309ace3e (diff)
downloadexternal_protobuf-31111e302e14330c3868e6b1456dbe1e0293edef.zip
external_protobuf-31111e302e14330c3868e6b1456dbe1e0293edef.tar.gz
external_protobuf-31111e302e14330c3868e6b1456dbe1e0293edef.tar.bz2
am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
* commit 'dad271e9a19fe98c4dd987ee5398b316309ace3e':
0 files changed, 0 insertions, 0 deletions