From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 17 Aug 2010 23:01:05 +0000 (-0700)
Subject: am e595037c: resolved conflicts for merge of bc411e69 to gingerbread-plus-aosp
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=27717d4d;p=android-x86%2Flibcore.git

am e595037c: resolved conflicts for merge of bc411e69 to gingerbread-plus-aosp

Merge commit 'e595037cf49109e9e20b47e6e191eda45e414008'

* commit 'e595037cf49109e9e20b47e6e191eda45e414008':
  Fix compilation error: invalid conversion from 'const char*' to 'char*'.
---

27717d4d722b98ce790a74a9bb030f5fdd99a8f6