aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/descriptor_unittest.cc
diff options
context:
space:
mode:
authorKweku Adams <kwekua@google.com>2015-02-11 19:19:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-11 19:19:57 +0000
commit7304898f86cd6b2e525772e9cda4ba686b7d3fd2 (patch)
tree1e150624e8f0f92e77c929722b6a9a7d14013163 /src/google/protobuf/descriptor_unittest.cc
parent41f547ad14998a2834cff9e755cd019a059ae33d (diff)
parent46fe64be0fc97ba82c8ac34f700b43a5e1a7653d (diff)
downloadexternal_protobuf-7304898f86cd6b2e525772e9cda4ba686b7d3fd2.zip
external_protobuf-7304898f86cd6b2e525772e9cda4ba686b7d3fd2.tar.gz
external_protobuf-7304898f86cd6b2e525772e9cda4ba686b7d3fd2.tar.bz2
am 46fe64be: DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.
* commit '46fe64be0fc97ba82c8ac34f700b43a5e1a7653d': DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.
Diffstat (limited to 'src/google/protobuf/descriptor_unittest.cc')
0 files changed, 0 insertions, 0 deletions