tree 419dc68f7ca2175981840bd71f7db9fc01870307
parent 8959954976b2b92c0b1935569cd963d292cd8e8c
parent 5094e33bddc5bb7ba8c63b725078764450b16973
author Ulas Kirazci <ulas@google.com> 1374784527 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374784527 -0700

am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""

* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
  Revert "Allow proto builds to pass in java proto params."