tree c95bee0eb2fc9774c432819d82d326dff3c76d35
parent 5878e9c46bf3b9b40a7b258a537cab1e0957a21c
parent 43c494cb9c23f8b2db23b00074d9dd931823250a
author Siyamed Sinir <siyamed@google.com> 1509475018 +0000
committer android-build-merger <android-build-merger@google.com> 1509475018 +0000

Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e am: b353fbcb7a am: 9422f6e991 am: cc2fcef375 am: 6ad6e7f2f4
am: 43c494cb9c

Change-Id: I398b3011295e2783f23ca7993cbca273fef38e47