Hybrid 2.0

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

Change-Id: I5a7efccefd681ffdf0457c8ca87826a5767587df
Revert "makefile changes for gcm javadocs"

We don't build it, nor do we have these sources.

This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e.

Change-Id: I877e617f90de1b832e26c98adbafc6238b98882f
services: don't clear wallpaper when SystemUI
disconnects.

When we restart SystemUI (or the user), sometimes
the wallpaper would get cleared. This patch just
captures its originating component and
if that is our SystemUI component, ignore the event.

Change-Id: I3e159dc2c013e7d7e552e3c0cef55e3ab970ca87
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge remote-tracking branch 'pa/hybrid2' into fjpa