tree 6678b2996fac05dbf7781a309cf0fe54e0b16302
parent 72070e4cf3caef4b4902cddcf823c88b984da7a2
parent f1376b3a24f1efff8bd9e0eda97d54800e090475
author Aurimas Liutikas <aurimas@google.com> 1488322774 +0000
committer android-build-merger <android-build-merger@google.com> 1488322774 +0000

Merge "Pull in two patches from protobuf upstream to suppress warnings"
am: f1376b3a24

Change-Id: Ic78a2791dc1d88600047382b2b2be8a264da0ec4