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