tree 91d5f3de53838de49db88d4b03273493f13945a1
parent f46eb3f813248ca925b1325846cfc6fde2ffbcfe
parent fe15574e195cea534201f1edb59bbf5c28fdd2e8
author John Spurlock <jspurlock@google.com> 1353456434 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353456434 -0800

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

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