tree c176e30e1b1a01f6798008f69fb1bacc95b62ebf
parent 86195bd9a39436a9dc39de782e20892f51cf7397
parent b8175ad3bf91dfd8b519e39d8f327e87e3e5aeca
author Elliott Hughes <enh@google.com> 1413239753 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413239753 +0000

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.