OSDN Git Service

am e29ef594: (-s ours) Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 31 Jan 2011 23:19:58 +0000 (15:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Jan 2011 23:19:58 +0000 (15:19 -0800)
* commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff':
  partial build fix
  partial build fix


Trivial merge