| commit | 5878e9c46bf3b9b40a7b258a537cab1e0957a21c | [log] [tgz] |
|---|---|---|
| author | Siyamed Sinir <siyamed@google.com> | Tue Oct 31 16:42:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 16:42:48 2017 +0000 |
| tree | c95bee0eb2fc9774c432819d82d326dff3c76d35 | |
| parent | f8fb25ca040327dedc45d97cbfb4cf4da4f0fe1b [diff] | |
| parent | 88f92e101d35fabcb8bd06abef96e467f3f18b72 [diff] |
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572 am: 88f92e101d Change-Id: Idd1358c39e0d4914bc7672707bf4b989a7c28815