OSDN Git Service

am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
authorNarayan Kamath <narayan@google.com>
Wed, 12 Aug 2015 10:39:16 +0000 (10:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 10:39:16 +0000 (10:39 +0000)
* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
  Fall back to persist.sys.language/country if locale isn't set.

1  2 
core/jni/AndroidRuntime.cpp
services/java/com/android/server/SystemServer.java

Simple merge