commit | fdb326a6aea28c18a1683fc6ba352f21ad4f8fd1 | [log] [tgz] |
---|---|---|
author | Siyamed Sinir <siyamed@google.com> | Tue Oct 31 17:13:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 17:13:06 2017 +0000 |
tree | 0bd72ddcdc6628e7ce082465053288b621a60310 | |
parent | 30a3dd97f68288e919ec851c1686162fe487b045 [diff] | |
parent | 1e5271979125a3a98626b2b237ec295b17e61b98 [diff] |
Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572 am: 88f92e101d am: 5878e9c46b am: 1e52719791 Change-Id: I946cb4da20d299c529a90ee7557e7d128e2e9504