tree 1664382aa17eb82db6f397d535fff7bd57ac2055
parent 60e96a56b433781d2f8db30fd188af167fc51277
parent e10c4c56e783d1813ae68ea73d1509c38c97f024
author Brad Fitzpatrick <bradfitz@android.com> 1284489583 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284489583 -0700

am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread

Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp

* commit 'fb85bc66c467be96fe8420338321df6f15359d7d':
  Add missing wallpaper service lock.