tree 4add666e6ac964252e0687ebaa2d6fbeeac86576
parent 46b2295695e659d6050fc87d9e677943bdfae45a
parent d2b211470fe2a9c6ef5ac22f534ac664f5a5feb5
author Anton Hansson <hansson@google.com> 1525248599 -0700
committer android-build-merger <android-build-merger@google.com> 1525248599 -0700

Merge "protobuf: Update path to android.jar."
am: d2b211470f

Change-Id: I0763cc93a1b5d8e29cf147eff559db62ac43735c