tree adf2522c99dddad9cd085f8fb049d3819036966a
parent 5eb1477a9438acd6a04687f6b705f4172f0d1035
parent e95a1190ff9e15ac0924cd7f294cf6a486e3119f
author Justin Ho <justinho@google.com> 1318897395 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318897395 -0700

am e95a1190: Merge "Update unlock halo asset" into ics-mr0

* commit 'e95a1190ff9e15ac0924cd7f294cf6a486e3119f':
  Update unlock halo asset