| commit | 40b4ff7e07c94a98da7ac5fb6c3aa9d6774ae750 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Oct 11 18:18:31 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 11 18:18:31 2018 -0700 |
| tree | 5b409ebd4bd2fec7fd211618f0cf43dad17fc5e8 | |
| parent | 84ab4a45e41f55e799dbb1746570de4c9c314964 [diff] | |
| parent | d7492fc872f0ed8eb24cba43bc40c6e21fdb4c87 [diff] |
Merge "Revert "Make the protobuf directory match closer to upstream"" am: d7492fc872 Change-Id: I22a6cae28fd49dc0da1fc53f502a04fa9428bb0d