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)
commit407b249e788f83b326376fef377e1f33ea054840
treef6fc0ccea77a13cc708b0410ee4bc0dc5b60d4a2
parent9f686c996bb45f0d377342fadfd20f5ae7a640de
parente29ef594e6836cdeee09de51f3a4b9af11cdabff
am e29ef594: (-s ours) Merge from open-source master

* commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff':
  partial build fix
  partial build fix