diff options
author | Brian Duff <bduff@google.com> | 2014-07-22 13:34:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-22 13:34:40 +0000 |
commit | f9b409e35963a357985ee687d096f8c166e0b80e (patch) | |
tree | 9692764ef6648b37fa43762477fd01fa23dca8a4 /config.h.in | |
parent | 60b72a8ef366b27110e8a70caacb2fcd97e1ce92 (diff) | |
parent | 95d99df4574c28debcf9646056a0350ff44bc7c9 (diff) | |
download | external_protobuf-f9b409e35963a357985ee687d096f8c166e0b80e.zip external_protobuf-f9b409e35963a357985ee687d096f8c166e0b80e.tar.gz external_protobuf-f9b409e35963a357985ee687d096f8c166e0b80e.tar.bz2 |
am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."
* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
Don't return NULL from {Boxed}PrimitiveTypeName.
Diffstat (limited to 'config.h.in')
0 files changed, 0 insertions, 0 deletions