OSDN Git Service

am 2039512c: am 61356271: am e388ac10: Merge "Extra protobuf-related support"
authorJean-Baptiste Queru <jbq@google.com>
Sat, 29 Jan 2011 16:02:06 +0000 (08:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 16:02:06 +0000 (08:02 -0800)
* commit '2039512c305c8fb21cdce1e338fd36ebeec8ec85':
  Extra protobuf-related support


Trivial merge