OSDN Git Service

am e595037c: resolved conflicts for merge of bc411e69 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Aug 2010 23:01:05 +0000 (16:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Aug 2010 23:01:05 +0000 (16:01 -0700)
commit27717d4d722b98ce790a74a9bb030f5fdd99a8f6
tree9e711aeb2099df6b484a15d1b92dc5f3b5071401
parentbfc0713bb26ec11c2000ba64439b3abdcb72a0bf
parente595037cf49109e9e20b47e6e191eda45e414008
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*'.