diff options
author | Jan-Willem Maarse <maarse@google.com> | 2014-05-01 18:36:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 18:36:30 +0000 |
commit | 58eb8e98d17971273548930a7e8d45e69995a2c8 (patch) | |
tree | 4070a6563d0d3f3637a8f5dc6677e38da93f84ce /aclocal.m4 | |
parent | ddeaf25683a5aa4d6e7ef784c7380c9332cdb3ce (diff) | |
parent | d20f0a4260763531acf5de677e4830afe0bfc53e (diff) | |
download | external_protobuf-58eb8e98d17971273548930a7e8d45e69995a2c8.zip external_protobuf-58eb8e98d17971273548930a7e8d45e69995a2c8.tar.gz external_protobuf-58eb8e98d17971273548930a7e8d45e69995a2c8.tar.bz2 |
am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
* commit 'd20f0a4260763531acf5de677e4830afe0bfc53e':
Fix NPE when clearing an extension in nano protos
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions