tree 6936721387a2a80040f44cb5805119f9855b4e3c
parent e79b65d6c6f6df7d6fd84a6f5c540bd99d71f152
parent 247842017e2a3b330b13b469ac8f9f3d3fa19a0e
author Sanket Padawe <sanketpadawe@google.com> 1421277604 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421277605 +0000

Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev