tree 5b409ebd4bd2fec7fd211618f0cf43dad17fc5e8
parent 84ab4a45e41f55e799dbb1746570de4c9c314964
parent d7492fc872f0ed8eb24cba43bc40c6e21fdb4c87
author Colin Cross <ccross@android.com> 1539307111 -0700
committer android-build-merger <android-build-merger@google.com> 1539307111 -0700

Merge "Revert "Make the protobuf directory match closer to upstream""
am: d7492fc872

Change-Id: I22a6cae28fd49dc0da1fc53f502a04fa9428bb0d