tree 89f90158e36dced43f525d124d0287e1f9b8a94e
parent 5e3cdc765536ded778f3be81dc923c3af3c680a1
parent a0c39e28e56d642168ad18dccb86f5787b4e1592
author Christopher Tate <ctate@google.com> 1317956425 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317956425 -0700

am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore

* commit 'a0c39e28e56d642168ad18dccb86f5787b4e1592':
  DO NOT MERGE: fix wallpaper restore