| commit | 7913a867a1edf65b438f111ef4becb4a0c597600 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Oct 30 16:42:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 30 16:42:33 2012 -0700 |
| tree | 0ebeaa8aef2afc74f7efe24d08b9b5855019e017 | |
| parent | e7f1e7fa3a691099b28a51e7825f6e0810b767da [diff] | |
| parent | 5b285941acf39da30b45c72fb1422cb2c39295ba [diff] |
am 5b285941: am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev * commit '5b285941acf39da30b45c72fb1422cb2c39295ba': Bring up unlock screen for FLAG_DISMISS_KEYGUARD.