tree d5089b229d82e127b53299c1002173efc89cd073
parent 9b3465792c9de9a1a793b8f36e7f15c4b449c072
parent 64ab8fcd6f2011c0d185f2973b9615f155f6d239
author Craig Mautner <cmautner@google.com> 1342045299 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342045299 -0700

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