Revert "Move CAF strings"

This reverts commit 8e2e5550df178db6addce5aed5c3f20e5a2193bb.
Move CAF strings

Change-Id: I5d8bbf7075d1d24391bbbf0d190a33cc097c40a6
frameworks/base: Don't report existing menu key if it was remapped.

Change-Id: Iabad06cd42cebecdff6f0440899432513681b063

Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java
frameworks/base: Fix key remapping after toggling navigationbar.

Change-Id: I8069e3106601caf3990cbcdc5056ffc64ddf7bcd

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Revert "SystemUI: Add data type and signal icons"

* These aren't used anywhere and are still Holo

This reverts commit 4e5e6d4cd8e56755d3e4cdaf08ede0e7ee3c82dc.

Change-Id: I39c6060766b2f75dd1362d945be31f6f9d20f59d
Status bar: Add HSPA+ icons

Forward port H+ icon in the status bar when connected to HSPA+
Uses new vector drawables by @blunden

PS1: Initial commit
PS2: New vectors (thanks @blunden)
PS3: Cleanup
PS4: Use correct indentation (oops)
PS5: Show correct icon in status bar (thanks @mikeNG)
PS6: Remove leftover Holo icons (thanks @mikeNG)
PS7: Rebase to depend on Holo icon removal (thanks @mikeNG)
PS8: Update commit message

Change-Id: Ia745c524d5e2530f50f12f961ea8533a4c8f5842
platform/framework/base: Fix Half Blank screen issue in Wallpaper

Issue: Start Any Full Screen Activity/ VideoView Activity in
       portrait mode, change to landscape mode and then perform
       suspend and resume. Only Half of the screen has display,
       the other half is blank screen

Fix: Added a check to update surface size on both rotation change
     and surface size change.

Change-Id: Iba77dfdb778ea3c60bbb1df33188fd4f792ab77c
CRs-Fixed: 712741
framework: add blacklist disconnect cause

Constant to be used when marking a Call as blacklisted.

Change-Id: If8e0ba7a2fb9b3ebbcfde04df48cd0ab14bba864
Signed-off-by: Roman Birg <roman@cyngn.com>
Update color dependent items when reusing notifications.

The notification might have changed its color setting.

Change-Id: Icf494db47b30af5505107eec2f728fb8bcba421a
Merge branch 'c5' into stage5