OSDN Git Service

am 27717d4d: am e595037c: resolved conflicts for merge of bc411e69 to gingerbread...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Aug 2010 23:09:05 +0000 (16:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Aug 2010 23:09:05 +0000 (16:09 -0700)
commitebf7131e0fb03010dd07ccb948c943300ac88c68
treead5e1a2e3d76e4d1bb05a893af608d7a76c88480
parent2e873a0e44e9d03fea38904b50480cf2e10f1ab3
parent27717d4d722b98ce790a74a9bb030f5fdd99a8f6
am 27717d4d: am e595037c: resolved conflicts for merge of bc411e69 to gingerbread-plus-aosp

Merge commit '27717d4d722b98ce790a74a9bb030f5fdd99a8f6' into dalvik-dev

* commit '27717d4d722b98ce790a74a9bb030f5fdd99a8f6':
  Fix compilation error: invalid conversion from 'const char*' to 'char*'.