From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 31 Jan 2011 23:19:58 +0000 (-0800)
Subject: am e29ef594: (-s ours) Merge from open-source master
X-Git-Tag: android-x86-4.4-r1~1862^2~26
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=407b249e788f83b326376fef377e1f33ea054840;p=android-x86%2Fbuild.git

am e29ef594: (-s ours) Merge from open-source master

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

407b249e788f83b326376fef377e1f33ea054840