tree 5f9c57ac3257d1b009e5bcfa0e5f0d5a34c34ab4
parent 9352474dae6835bad03151c763ff4c67b7c34dd9
parent 6a5fc54fe9904214a7df1d34c9d48ad0310d867e
author Ulas Kirazci <ulas@google.com> 1374738429 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374738429 -0700

am 6a5fc54f: am a825aa13: Merge "Allow proto builds to pass in java proto params."

* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
  Allow proto builds to pass in java proto params.