tree d31abbfde646c38d4e93da8614cc654706313162
parent 75fd2d5f5503e0a3483329076f243d468ec2d303
parent 8931c3f5598a81d8c4b8923075d34ef5aeb4ba45
author Fyodor Kupolov <fkupolov@google.com> 1473820476 +0000
committer android-build-merger <android-build-merger@google.com> 1473820476 +0000

Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev am: 05918fd123 am: 06f06dd228 am: cc000863db
am: 8931c3f559

Change-Id: I0a45e0e1cec68bca769a760e98863d62032baa05