summaryrefslogtreecommitdiff
path: root/libs/utils/String16.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2010-05-10 12:53:28 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-10 12:53:28 -0700
commit914b12a965de255f4a496f39f7f9366a408b7c2f (patch)
treeb013fbb9d1d2f493488ba7f3fcebca98f88110c1 /libs/utils/String16.cpp
parent5d95f613a7488d540602879958fa0a25a798ce9a (diff)
parent03ba157ee34b92153e201af5f8640aae868822d2 (diff)
am 686d9ff5: merge from open-source master
Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken * commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51': Use isLocationProviderEnabled to test for enabled providers Added WEB_URL_PATTERN for Montenegro ".me" long modifier was on the wrong argument.
Diffstat (limited to 'libs/utils/String16.cpp')
0 files changed, 0 insertions, 0 deletions