Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp * commit 'fb85bc66c467be96fe8420338321df6f15359d7d': Add missing wallpaper service lock.
Merge commit 'fb85bc66c467be96fe8420338321df6f15359d7d' into gingerbread-plus-aosp * commit 'fb85bc66c467be96fe8420338321df6f15359d7d': Add missing wallpaper service lock.