tree d4396db9701c60808f4930b95d65ba1f981a06af
parent 9c441159f9a46a06b5771f6485f68936d17af373
parent a0c253d07ad8a1d208311e29370d4de235e656a9
author Siyamed Sinir <siyamed@google.com> 1509467126 +0000
committer android-build-merger <android-build-merger@google.com> 1509467126 +0000

Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
am: a0c253d07a

Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1