From: shared_user android-merger-prebuild <android-merger@google.com>
Date: Tue, 18 Jan 2011 16:21:32 +0000 (-0800)
Subject: reovle conflicts for cc089099
X-Git-Tag: android-x86-4.4-r1~1862^2~59
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=be7ca98a86a6fc6de822a410c3234fbccd67fd0c;p=android-x86%2Fbuild.git

reovle conflicts for cc089099

Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b
---

be7ca98a86a6fc6de822a410c3234fbccd67fd0c