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
frameworks_base: ES translations

Change-Id: I15f2cddcdf2fef9e34bc93527e35e94b1d35ff8d
Frameworks/base : FR translations

-Add new translation
Patch set 2 : correction
Patch set 3 : rebase and add new translation
Patch set 4 : correction

Change-Id: I475022889e0e89fe683888eb9a77d87e4581f411
Merge "frameworks_base: ES translations" into cm-10.1
Merge "Frameworks/base : FR translations" into cm-10.1
Merge branch 'cm-10.1' into martincz
am: Fix the privacy guard notification

 * The privacy guard notification was not showing everytime. Fix the
   logic and handle it in the right place so it hits both the create and
   resume startup path.

Change-Id: I80c88ffb0fcb4ed3ea64ceb228bb436975278ecc
don't refresh view when item checked or datachanged

Change-Id: Ie8c28c389a0def68ba2873a81a7460e068ff84c8
Add SMS Middleware layer.

Add fix so ordered broadcasts are delivered to system
apps first in the event of a tie. This works around
the issue where terrible apps steal SMS notifications
from the broadcast queue to simply prevent notifications
that could otherwise be removed by a toggle.

Change-Id: I4fff0c584f8fce9c5f2f4fe86a82fe6480c307c7
Frameworks_base: PT-BR update translations

Change-Id: I7a76e50b14664654e1bee0a0d59ae73c2748ea3a
Merge branch 'cm-10.1' into martincz
framework: Simplified Chinese Translations

Change-Id: I4bfed2467906af8cb4650d5f60eedc37ba96e363
Core: HU translation

PS2: Correcting...

Change-Id: I3962a875e71348a4506a5409db4b2d357838ee30
core: NL translation

ps1: framework: Privacy Guard
and change application -> app for English

ps2: Profiles: Add a profile picker activity

ps3: suggestions

ps4: Add SMS Middleware layer

Change-Id: I826e62dfb79cdbac1482a34fe8c35da77a6a83ed
Correctly release lockscreen lock on tile destroy.

Change-Id: Idc5f9be9a42a800570bcf63118be293ed7760f5f
When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9
Delay closing the notification area after swiping a little closer.

Use the same value as when removing all notifications.

Change-Id: Id11a48bc47487fd7763503dcbc769d9dbf5ad16a
Merge "am: Fix the privacy guard notification" into cm-10.1
Frameworks: privacy guard fix possible NPE

If the user flash a data app over recovery on clean flash
(like a lot themed apps or gapps packages are doing)
the user will get into a bootloop because of an NPE
due an unknown state of the user due that
installedUser == null

To fix it
Check if installUser exists if yes then
call the provider settings value for the current
user

PatchSet 2+3: message update
	      fix for real now

Change-Id: Ie5f94a0d0a11ae24fdfdc8372c0433b26793b66e