tree 55938e638c6e79b645b204798b7910f53d0162b3
parent d320b73aac1a69cfbf330726c948841f4e448745
parent 8e0b67272db3ee5c691287f4ec7a40313c15b98f
author Ryan Mitchell <rtmitchell@google.com> 1571099041 -0700
committer android-build-merger <android-build-merger@google.com> 1571099041 -0700

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

Change-Id: Ifabb5b2cbb46e18cd0c350d5bb1d6e20c202aa70