| commit | 81fcede86d89287a5add53b256d384f9a370d77d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 13 22:35:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 22:35:53 2014 +0000 |
| tree | c176e30e1b1a01f6798008f69fb1bacc95b62ebf | |
| parent | 86195bd9a39436a9dc39de782e20892f51cf7397 [diff] | |
| parent | b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca [diff] |
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 'b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca': Ensure that the SIM language doesn't override the user language on the encryption UI.