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
Merge "Make contacts app aware of blacklist being disabled (1/3)" into cm-10.1
Merge "FileUtils: add method to get UUID of a volume" into cm-10.1
Merge "Fix requery behaviour of MemoryCursor." into cm-10.1
Merge branch 'cm-10.1' into martincz
Merge branch 'cm-10.1' into martincz
Also backup profiles file via backup manager.

Change-Id: Id70cb1bce15b7de127e4291e9482ab3fd7270f9f
Fixes for clang:
PackageInfo is a class, not a struct.
String16 is contained in the android namespace. Do not namespace prefix it
within the android namespace.
Explicitly specify which std classes are necessary to prevent ambiguous
type errors. (map, set)

Change-Id: I0d01477a976e770821ebae8847f8d11b132a15d6
Add lockscreen rotation as an optional rotation setting (1/2)

This will allow the user to select wether or not to use the
rotation settings for the lockscreen.  This is dependent
upon the rotation setting being checked.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ibd7c69b0af1e0a7d91b985f2b21ea0b5bc619a70
JIRA: CYAN-339
New Event: ACTION_NEW_OUTGOING_SMS

Change-Id: I8be01ad6251ca25e4d00ebffd876bb6ce7f3c283
Merge "Add lockscreen rotation as an optional rotation setting (1/2)" into cm-10.1
Merge "Also backup profiles file via backup manager." into cm-10.1
Merge branch 'cm-10.1' into martincz
frameworks: cleanup

Change-Id: I8e48a1a4fb1cb666c4f1d2bf8e868799cecc5eaf
Merge "Fixes for clang: PackageInfo is a class, not a struct. String16 is contained in the android namespace. Do not namespace prefix it within the android namespace. Explicitly specify which std classes are necessary to prevent ambiguous type errors. (map, set)" into cm-10.1
Merge branch 'cm-10.1' into martincz
HALO: Style revamp

- speech bubbles are centered
- number batches are roundand simplified, same color as in g+
- markers appear as dots above the bubble
- hiding and dimissing triggers text hints
- couple of bugfixes

WARNING: some of the drawables are good for xhdpi only for now and must
be scaled down for the other resolutions

Change-Id: Ic1ef104e3840566f9f945c38bf70eefa2b72d46e
HALO: Prevent notification acces via HALO on protected lockscreens

Change-Id: I69505a5f4f6477b16a2914074e349483a88f0692