OSDN Git Service

am 53cebd72: (-s ours) am ad3e0072: am 39f358b7: Merge "Protobuf compiler support...
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 16:01:55 +0000 (08:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 16:01:55 +0000 (08:01 -0800)
* commit '53cebd72f7bf4fcc430c42f5eb925fec4c77d209':
  Protobuf compiler support in the build system


Trivial merge