FileUtils: add method to get UUID of a volume

Change-Id: I41b76c5e01c82a2f8e67b33133a76947877a2814
Make contacts app aware of blacklist being disabled (1/3)

Change-Id: Ic59f370a6e78390c9b2b1510e0ec85b2f4af9146
Fix requery behaviour of MemoryCursor.

As we can't restore the contents of the cursor window, we need to keep
it on deactivation so we can restore it on requery().

Change-Id: I06f688bbe9120c307bdc3ddbc3833416becdec82
frameworks_base: ES translations

Change-Id: Ie135371c38a93f97d96fad396a79800706706865
core: SK translation

Change-Id: Ia9df7c21ab20c7b20205ccb0b7de1935e38ee9c3
Merge "frameworks_base: ES translations" into cm-10.1
Merge "core: SK translation" into cm-10.1
merge changes from remotes/github/cm-10.1 into master
Merge "Make contacts app aware of blacklist being disabled (1/3)" into cm-10.1
merge changes from remotes/github/cm-10.1 into master
Merge "FileUtils: add method to get UUID of a volume" into cm-10.1
Merge "Fix requery behaviour of MemoryCursor." into cm-10.1
Expand Profiles [1/2]

This commit expands the profiles power menu entry in the to be
- Always hidden
- Hidden only on the lockscreen
- Always show [not applicable to secure lockscreen]

Change-Id: I2e7262abc4043523150e96b330f92c8c042d1d2a

Conflicts:
	policy/src/com/android/internal/policy/impl/GlobalActions.java
HALO: Fix memory leaks

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/halo/HaloProperties.java

Change-Id: I8cc1a0c4f33f2e1895c1026d90dc8b6cad319e0b
Frameworks: a bit taste of android 4.3

most changes are under seems to be under the hood and are
not mergeable due that we have no code...... UI changes
are minor....but our lovely Roboto font is pimped up on the
new android version. So here we go

cheers

Change-Id: I139bcdeaefe5125ba8974fc88423c62d62b1b429
Add recents ram bar, (2/2):

Ported from Slimroms:

recents ram bar:

https://github.com/SlimRoms/frameworks_base/commit/90441dd038dfdeff6cd28a1e251faa84e1c7728d
https://github.com/SlimRoms/frameworks_base/commit/1120f72d469e582730e16f9a21016ce5c618b5b6
https://github.com/SlimRoms/frameworks_base/commit/7da4083e3acc479bed1aaa807df88cd0c60aa602
https://github.com/SlimRoms/frameworks_base/commit/eef73ab26de18e939c557305a0b6ed1eaab1e4a1

Force clear cache on 'clear all':

https://github.com/SlimRoms/frameworks_base/commit/8daa8d476cf66ac51c74b92320cba55475e1774d

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/status_bar_recent_panel.xml

Change-Id: I579ea1f0c760247d0a8efc148f34f2fda3452c4c
Fix Derp

Change-Id: Ib1ecbd4fe78d762dbd47c0d878650bae0b838c72
Clear recents side switcher [2/2]

Signed-off-by: Andros Rosa <andros2011@gmail.com>

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/system_bar_recent_panel.xml

Change-Id: Ida05eb091964ad3dcb5d92c9a51a4fe72b12f9fc
merge changes from remotes/github/cm-10.1 into master