tree 94e5ef851aaefc64a1f8f9daa51c25795ecbd0b1
parent 15569c461a1e62a0b7bff25e680dbaa8a43d683d
parent 31502d3d95610930b56bb7931dbd57a997f9ce8f
author Michal Karpinski <mkarpinski@google.com> 1453981643 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1453981643 +0000

Merge "Logging of keyguard actions into security log"