tree 1e1356655006210f6023a04effff4fa7a117561b
parent cbb057d3daee8e784a4bf2909f7a39033cb7b479
parent 1f8025adf287d96de682de57f18277e2dd523fe1
author Adrian Roos <roosa@google.com> 1482880843 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1482880847 +0000

Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev