tree 990fd2e6a1143605f7540f788313ba8f9817895a
parent 461b3896babdbfb365282378df89cde2dddb5a3a
parent 9c33f28d912c9b51bff69e3eaad7090a6b8a3ec3
author Elliott Hughes <enh@google.com> 1413233729 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413233730 +0000

Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev