| Index: third_party/protobuf/README.chromium
|
| diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium
|
| index 298c2073d1286adcf639809745e5ac66e874899a..de7839265a1a20c3fbbbd4142123bf3994f0e768 100644
|
| --- a/third_party/protobuf/README.chromium
|
| +++ b/third_party/protobuf/README.chromium
|
| @@ -33,6 +33,7 @@ Revision 517 was cherry-picked from upstream.
|
| Revision 522 was cherry-picked from upstream.
|
| Revision 523 was cherry-picked from upstream.
|
| Revision 524 was cherry-picked from upstream.
|
| +The `&file->options() != NULL &&` was removed from descriptor.cc
|
|
|
| Notes about Java:
|
| We have not forked the Java version of protobuf-lite, so the Java version does
|
|
|