Elliott Hughes 19c4c577ab am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev ...

* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
  Ensure that the SIM language doesn't override the user language on the encryption UI.

2014-10-13 22:03:23 +00:00

..

java/com/android/server

am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev

2014-10-13 22:03:23 +00:00

jni

resolved conflicts for merge of 6290c048 to lmp-dev-plus-aosp

2014-09-30 16:41:59 -07:00

Android.mk

…