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 | 3e46c9b5dae5adc46599c33f1bf6c6a972c6d1fc (patch) | |
tree | 721db8c33a239ec11f3b4b68e537e92d660b38d7 /java/README.txt | |
parent | af802cd274e782ab6b84b5a5c52a33ec91a61830 (diff) | |
parent | 4aecb2b6d560bd3fa62107888eb8c363c485ae30 (diff) | |
download | protobuf-3e46c9b5dae5adc46599c33f1bf6c6a972c6d1fc.tar.gz protobuf-3e46c9b5dae5adc46599c33f1bf6c6a972c6d1fc.tar.bz2 protobuf-3e46c9b5dae5adc46599c33f1bf6c6a972c6d1fc.zip |
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 'java/README.txt')
0 files changed, 0 insertions, 0 deletions