| Index: third_party/cq_client/validate_config.py
|
| diff --git a/third_party/cq_client/validate_config.py b/third_party/cq_client/validate_config.py
|
| index 1e34b868e1172e0222856d9a8a79a09397c1460a..17d91dbb32c72d329427cf167b1ea2369a4f6849 100644
|
| --- a/third_party/cq_client/validate_config.py
|
| +++ b/third_party/cq_client/validate_config.py
|
| @@ -6,11 +6,7 @@
|
| """CQ config validation library."""
|
|
|
| import argparse
|
| -# The 'from google import protobuf' below was replaced to fix an issue where
|
| -# some users may have built-in google package installed on their system, which
|
| -# is incompatible with cq_pb2 below. This hack can be removed after
|
| -# http://crbug.com/503067 is resolved.
|
| -import protobuf26 as protobuf
|
| +from google import protobuf
|
| import logging
|
| import re
|
| import sys
|
|
|