OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d95f61 03ba157)
am 686d9ff5: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 May 2010 19:53:28 +0000 (12:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 May 2010 19:53:28 +0000 (12:53 -0700)
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.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help