tree 18c515540e7173fb2ff3dee939add491945b3b0b
parent 5a50ecee40fa2b5e49a8467b35509651f07fb3de
parent ad3e00724d62e5def2f2552533a62a800e9f3ee9
author Jean-Baptiste Queru <jbq@google.com> 1296163923 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296163923 -0800

am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"

* commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9':
  Protobuf compiler support in the build system