| commit | c130b428c5d7eb25dc7651c5cea82182f2241ddf | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 13 20:55:29 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 13 20:55:30 2014 +0000 |
| tree | 990fd2e6a1143605f7540f788313ba8f9817895a | |
| parent | 461b3896babdbfb365282378df89cde2dddb5a3a [diff] | |
| parent | 9c33f28d912c9b51bff69e3eaad7090a6b8a3ec3 [diff] |
Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev