| commit | 866bae50b7e8f0389b67df54eaf829fa50bc8eaf | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Nov 20 21:41:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 21:41:41 2014 +0000 |
| tree | 7e611bdae137acc41afa748625eacddfdd012dbe | |
| parent | 9bb16f55e80afaeb6700af9fc97a58a8b3309412 [diff] | |
| parent | af6e657ab873623ed0e94bc8bcf8ed03f6bbe167 [diff] |
am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev * commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167': Update KeyguardManager.isDeviceLocked API