tree d6f85f8841ee2244d8aa3c8033f92c5a494641e9
parent f6b40944e9d03c54a1449401605f9d6d42112bc1
parent e8b24ddd6769a431b8fa3462e00c85211787a08d
author John Spurlock <jspurlock@google.com> 1363291198 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363291198 +0000

am e8b24ddd: am adb9554d: Merge "Enable back button in keyguard security account mode." into jb-mr2-dev

* commit 'e8b24ddd6769a431b8fa3462e00c85211787a08d':
  Enable back button in keyguard security account mode.