diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-08-21 10:39:27 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-08-21 10:39:27 -0700 |
| commit | ba4e54724d2e6a1881c4fe88664d81fbacaf8c08 (patch) | |
| tree | 5451ab616f035b92d006e51ec01b4c0dabb3f6d0 /src/google/protobuf/map_type_handler.h | |
| parent | 472f700884a2cd4e9b621c5e4b706a9b6de7c870 (diff) | |
| parent | 139775ccc040a07e07c5407e34834dab27928cbc (diff) | |
Merge pull request #3529 from pherl/merge3.4.x
Merge 3.4.x into master
Diffstat (limited to 'src/google/protobuf/map_type_handler.h')
| -rw-r--r-- | src/google/protobuf/map_type_handler.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/google/protobuf/map_type_handler.h b/src/google/protobuf/map_type_handler.h index aa365991..423c98f1 100644 --- a/src/google/protobuf/map_type_handler.h +++ b/src/google/protobuf/map_type_handler.h @@ -32,7 +32,6 @@ #define GOOGLE_PROTOBUF_TYPE_HANDLER_H__ #include <google/protobuf/arena.h> -#include <google/protobuf/generated_message_util.h> #include <google/protobuf/wire_format_lite_inl.h> namespace google { |