Merge "frameworks: add keyguard wallpaper functionality to WallpaperManager" into lollipop
Merge "Move CAF strings" into lollipop
Merge "frameworks/base: Don't report existing menu key if it was remapped." into lollipop
Merge "frameworks/base: Fix key remapping after toggling navigationbar." into lollipop
Merge "Revert "Revert "Fix battery % always showing at < 100%""" into lollipop
Merge "Battery text mode (1/2)" into lollipop
Merge "Revert "SystemUI: Add data type and signal icons"" into lollipop
Merge "platform/framework/base: Fix Half Blank screen issue in Wallpaper" into lollipop
Merge "Status bar: Add HSPA+ icons" into lollipop
Merge "Update color dependent items when reusing notifications." into lollipop
Merge "Battery text mode: fix MSim crash" into lollipop
Merge "VideoView: Add logs for video start/stop profiling" into lollipop
Merge "audio: fix unresolved link error for javadoc" into lollipop
Merge "Move media player list management to Audioservice" into lollipop
Merge "Revert "MediaMuxer: handle expection for add track"" into lollipop
Merge "Revert "camera2-legacy: Workaround max jpeg/preview size AR mismatch"" into lollipop
Merge "SystemUI: kill MSim logspew" into lollipop
frameworks: add keyguard wallpaper functionality to WallpaperManager

Adapted for cm-12..

Change-Id: I0eb1b5578b705c2ade4c0772fa86e09478b9f73e
Signed-off-by: Roman Birg <roman@cyngn.com>
Move CAF strings

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

Change-Id: Iabad06cd42cebecdff6f0440899432513681b063