tree 21a65cd5c5d6951d6fc6b1a03e701a6b59b0aef7
parent 2ea2d1cb10f4f7995db6878db6a8e436dd3aa010
parent 3146aa7630073c1a303e0cb131a8bf2ae70340c0
author Julien Desprez <jdesprez@google.com> 1526681182 -0700
committer android-build-merger <android-build-merger@google.com> 1526681182 -0700

Merge "Add all the internal protos to the java protobuf lib"
am: 3146aa7630

Change-Id: I7e1dc5a7af2c0f3c2f856fdab5a23fd548d1b5b6