summaryrefslogtreecommitdiff
path: root/android/PhoneticStringUtilsTest.cpp
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-04 10:57:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-04 10:57:41 -0700
commit6c75f0d20ef5ade654dc32eae196b6d212e9d353 (patch)
treec0789b80607a28ebd31c0528c6033d824e19900b /android/PhoneticStringUtilsTest.cpp
parent439e88e7d09bfeac4690f2d9df6533955aa4fa88 (diff)
parent1c376985dd7602cd3542714b7eb46a5198270658 (diff)
am 1c376985: Merge 59fa028a from open-source master
* commit '1c376985dd7602cd3542714b7eb46a5198270658': Fix compilation error: invalid conversion from 'const char*' to 'char*'.
Diffstat (limited to 'android/PhoneticStringUtilsTest.cpp')
0 files changed, 0 insertions, 0 deletions