am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into...

author Justin Harrison <astyrrian@google.com>

Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)
author Justin Harrison <astyrrian@google.com>
Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java

index a3d7aaa,b107d9a..2b5064f

mode 100644,100755..100644
--- 1/services/core/java/com/android/server/am/ActivityManagerService.java
--- 2/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
author	Justin Harrison <astyrrian@google.com>
	Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 13 Jan 2015 23:26:23 +0000 (23:26 +0000)