| commit | eb7c28c4b09461643e57411c0354ec65d3969ecb | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Thu Nov 08 15:55:40 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:55:40 2012 -0800 |
| tree | 4d80fdd297917f0237dac467555ba0c163ceb3b9 | |
| parent | 88816e5c4fe0dc3a8d8bbe4da6ad6a95779e52af [diff] | |
| parent | eac1e897bb939d6ce7cb987754939eb734e2cc24 [diff] |
am eac1e897: am 29cc9489: am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev * commit 'eac1e897bb939d6ce7cb987754939eb734e2cc24': add some defensive code to enableUserSelectorIfNecessary.