| commit | e89bfcd14d1d504ede6496012caaedb977140589 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 14 17:30:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:30:30 2014 +0000 |
| tree | b5cb57d013ff34e3f388021aac3badceefc45447 | |
| parent | 755799c7076c4f2732f2b4c4925febdad4786ff2 [diff] | |
| parent | 07b68d8ad4a6f7d4fff2806819050657238e04ab [diff] |
am 07b68d8a: 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 '07b68d8ad4a6f7d4fff2806819050657238e04ab': Ensure that the SIM language doesn't override the user language on the encryption UI.