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

Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'

* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
  Add missing wallpaper service lock.