tree 6678b2996fac05dbf7781a309cf0fe54e0b16302
parent 9764ba41a78d953f6a74dc7b352cb7cade8edf73
parent 0536f43ba6b04df7c54a11820b206b6c91080e7e
author Aurimas Liutikas <aurimas@google.com> 1488322894 +0000
committer android-build-merger <android-build-merger@google.com> 1488322894 +0000

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

Change-Id: Ifcf30d8a436e82e213936379eb27fcc72f35e95f