tree 12dbd44645269177b9e61a238dab749a4de53b28
parent b1d094ba104f804d152b83517bb7500304f6bae8
parent 82b18e8d5c4ceac56c4f5d6ca96f69e37a21eeb3
author Daniel Sandler <dsandler@android.com> 1352409236 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352409236 -0800

am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev

* commit '82b18e8d5c4ceac56c4f5d6ca96f69e37a21eeb3':
  Don't crash if no ECA.