tree 67c48ad0e1edaaaa334fa40aabcb08b66a4b1c6d
parent 7f56e2c6f27f4230e981a33a450b01d810b75e66
parent 5e3a1ba15fd48067026f23100d700b76b203fd7a
author Ryan Mitchell <rtmitchell@google.com> 1571099431 -0700
committer android-build-merger <android-build-merger@google.com> 1571099431 -0700

Merge "Allow protoc-gen-javastream to build statically" am: 6afb115dea am: 8e0b67272d
am: 5e3a1ba15f

Change-Id: Ic47ff6540a54ac4e576657a77c579462cd3b1f36