OSDN Git Service

am d17c8977: am 0b6a436f: Merge "Fix build"
authorJean-Baptiste Queru <jbq@google.com>
Tue, 27 Mar 2012 15:08:41 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Mar 2012 15:08:41 +0000 (08:08 -0700)
* commit 'd17c89776e71f61852ac6ec3a75859a832cf1ba6':
  Fix build


Trivial merge