tree 66b434e52eddf241be02100ab6fa8a27f348637e
parent bf69383a3856fadaea552cc752d96db031aac7c0
author Colin Cross <ccross@android.com> 1539202736 -0700
committer Colin Cross <ccross@android.com> 1541112359 -0700

Revert "protobuf: work around a static analyzer bug"

This reverts commit 95dea5c42f563f1fb60ca81eb837294324e6029f.

Replacing with merge from upstream.

Bug: 27101951
Bug: 117607748
Test: m checkbuild
Change-Id: I5bcc0cd00d5476df0fae94df7db61836b8b31075