tree 9547a90473bf061e091f76fc1fd701f4f435ceeb
parent 986c231b4aaf6be7f12c381c027f41baa76897c7
parent 488eddca0f1b2fd824de52e0f38c90b2d129d3b0
author Justin Ho <justinho@google.com> 1318897385 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318897385 -0700

am 488eddca: Merge "Update lockscreen assets" into ics-mr0

* commit '488eddca0f1b2fd824de52e0f38c90b2d129d3b0':
  Update lockscreen assets