tree 9c59b25a5576734e27644ee0481054a342283372
parent 6a13e3be66340c8f408f985219450fec30bbea41
parent 078e91b03a14b9e84f811a9941ca412f5d281dab
author Ian Pedowitz <ijpedowitz@google.com> 1452880285 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452880285 +0000

Merge "Fix crash in KeyguardManager.isDeviceLocked"