tree 2a7003d8c7d201b5cbacfbe808eeb26147b60b63
parent 69d13491eaf0d90b2a1740373306a12bc6238bd4
parent 92cabadf900e5489c33599becebc8265569d57ff
author John Spurlock <jspurlock@google.com> 1353456310 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353456310 -0800

am 92cabadf: am dc3d76f2: Merge "Refactor the lockscreen camera widget, removing the bitmap." into jb-mr1.1-dev

* commit '92cabadf900e5489c33599becebc8265569d57ff':
  Refactor the lockscreen camera widget, removing the bitmap.