| commit | 07b68d8ad4a6f7d4fff2806819050657238e04ab | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 14 17:22:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:22:44 2014 +0000 |
| tree | 33f9a4e49a3408728f83980d54954a46a3446053 | |
| parent | 7d5e9455f479d3a2685c84388ef752d08c49e7fc [diff] | |
| parent | 81fcede86d89287a5add53b256d384f9a370d77d [diff] |
am 81fcede8: am b8175ad3: am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev * commit '81fcede86d89287a5add53b256d384f9a370d77d': Ensure that the SIM language doesn't override the user language on the encryption UI.