OSDN Git Service

am 55b7d124: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:54:56 +0000 (13:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 May 2010 20:54:56 +0000 (13:54 -0700)
commit50c434ca216b2a94f1c30dbfc1635d572a2bf45f
treea86fbca9a6c2aebc8cc8c558d932c3e4ed9d2744
parent078418eccda820d49c626b39ec95da60c20c3274
parent4dd72e10ee8728834c2eb90aa6f800fa80206f61
am 55b7d124: merge from open-source master

Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken

* commit '55b7d1243f15395a102971e8fdc57444638729ac':
  SetLocaleByCarrier, only if its not an unknown carrier.