| commit | 473b3345a763d45ee93214322f8d984ed4dd60af | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Oct 31 17:14:37 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 31 17:14:37 2017 +0000 |
| tree | 0bd87659333d6e7cc2aa323a57a32fcb204191dc | |
| parent | 2fdc78dca4831b3b6649128aabcf0cec6e7236df [diff] | |
| parent | fdb326a6aea28c18a1683fc6ba352f21ad4f8fd1 [diff] |
Merge "Merge "Use calling user ID when calling isDeviceLocked" into oc-dev am: 31bcb22572 am: 88f92e101d am: 5878e9c46b am: 1e52719791"