tree d1659573855aedc37e2102ac38e36b3114717577
parent 5683204632cc0b5ed129921b0ca3ea01cbd9bb9a
parent fb9f736a3c6c2e1c91c69b1abc0456b54215e8ef
author Joe Onorato <joeo@google.com> 1481164785 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481164790 +0000

Merge changes from topic 'proto convenience methods'

* changes:
  ProtoOutputStream convenience methods.
  Give protoc-gen-javastream the ability to output multiple java files.