tree fc6f9bae5c2567e5bc25d94d68d4e9d44662387c
parent 7f1637c731e22da05cc025dc4ba523de3972846d
parent 94f8143129860b6ee952acf542b80b6e78afd1ca
author Lucas Dupin <dupin@google.com> 1502298457 +0000
committer android-build-merger <android-build-merger@google.com> 1502298457 +0000

Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev
am: 94f8143129

Change-Id: I3d4eac2b5d290f3c90ec9e5acb69db86272200e3