| commit | c42a44931f75076d93860de2a7d2caa38a553b88 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Mar 21 17:21:07 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 21 17:21:07 2013 +0000 |
| tree | 14b155044ce64f38d38ff9e6ed7623857137c145 | |
| parent | a383eba1cc94f365b15a087ca381da3525f3fb5c [diff] | |
| parent | b2bf4ecd4ab7c2182c2a6611ff6dead67e712a80 [diff] |
am b2bf4ecd: am 71b00177: Merge "Fix issue #8410116: "Disable your screen lock" permission..." into jb-mr2-dev * commit 'b2bf4ecd4ab7c2182c2a6611ff6dead67e712a80': Fix issue #8410116: "Disable your screen lock" permission...