commit | 05576cc784fef0067c5b03ed85291b41d9098877 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Fri Nov 21 02:58:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 02:58:00 2014 +0000 |
tree | 92dd832280fa187230667217e09979e9e9beec6b | |
parent | b1ff9cc78848a6b9b1a0c28367ff50af8c682a48 [diff] | |
parent | cf047b5d554b35e504f33994f3a07624c2690633 [diff] |
am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 * commit 'cf047b5d554b35e504f33994f3a07624c2690633': Update KeyguardManager.isDeviceLocked API