commit | 779a33b779cbdbb22b590a4b9a073b73d0454f3d | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Wed Jul 11 15:21:39 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 11 15:21:39 2012 -0700 |
tree | d5089b229d82e127b53299c1002173efc89cd073 | |
parent | 9b3465792c9de9a1a793b8f36e7f15c4b449c072 [diff] | |
parent | 64ab8fcd6f2011c0d185f2973b9615f155f6d239 [diff] |
am 64ab8fcd: (-s ours) am dcddea95: Merge "Handle keyguard visibility states separately. DO NOT MERGE" into jb-dev * commit '64ab8fcd6f2011c0d185f2973b9615f155f6d239': Handle keyguard visibility states separately. DO NOT MERGE