tree eb1523a1e45a3d332373aac5d06638f2267df60a
parent 3da8ce96f6d207f139276ca5927b91ecb2e07128
parent 3ff6e1d43754b686b936cb4d533f25cc87272322
author Jeff Davidson <jpd@google.com> 1431543096 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431543096 +0000

am 3ff6e1d4: am 937c295d: Merge "Update aprotoc prebuilts."

* commit '3ff6e1d43754b686b936cb4d533f25cc87272322':
  Update aprotoc prebuilts.