| commit | b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 13 22:08:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 22:08:39 2014 +0000 |
| tree | c176e30e1b1a01f6798008f69fb1bacc95b62ebf | |
| parent | 1229d266f60b9e40e92a5fcee8baeaedd7e8c367 [diff] | |
| parent | c02ddd6a0a4643ce49150231a104d77d90c13f27 [diff] |
am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev * commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27': Ensure that the SIM language doesn't override the user language on the encryption UI.