| commit | 5b285941acf39da30b45c72fb1422cb2c39295ba | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Oct 30 16:39:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 30 16:39:53 2012 -0700 |
| tree | d99e4103b43f49365e60172a183f5e98e751e5b6 | |
| parent | 517303e05b9a9246c8aab53574d768eb52c88e7e [diff] | |
| parent | 7710199376657415e5341f64a830aa50fcb117aa [diff] |
am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev * commit '7710199376657415e5341f64a830aa50fcb117aa': Bring up unlock screen for FLAG_DISMISS_KEYGUARD.