tree 8de446341394ffb7368802e27c0c0d840d8e8229
parent 272e6c55244a8f7ea6434a3ef8a67c3e264613bc
parent b89f1b2fceaf487eb88b38487f8d01b7b6813093
author Justin Ho <justinho@google.com> 1318897384 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318897384 -0700

am e93f09d6: Merge "Update lockscreen assets" into ics-mr0

* commit 'e93f09d66853f568eb253b458bd2cad2a34cb79a':
  Update lockscreen assets