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
SystemUI: NL translations

Change-Id: Icc9736b7954d1922bcb7e8d4186daf257543d444
Add permission that allows cancelling notifications from other apps.

Change-Id: I055b17873e174f71174898a7649b1e221fd8c436
Merge "Add permission that allows cancelling notifications from other apps." into cm-10.1
Core & SystemUI: HU translation

Change-Id: Ib977ef5e3aa77a16ad6c6b8987a0e4b93824a146
Core: RU translation

Change-Id: I88f1ab6d0249315c5a807af10ae7d1afaab0cbe7

Patch set 2: Update translation

Change-Id: Ic3c4ce6d314c00459a904a8dfa46402704d2954a

Patch set 3: Fix typo

Change-Id: Ia58de9fc9e7d9b969773663b3f3ebefe71cb9e87
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
Update German translation.

Change-Id: I5a01819949e322a7bd144684352b7a2bbc4401f0
core: PT-BR update translations

Change-Id: I5700f6b7a6ffe9341af37a713eaf56c591cc6351
frameworks_base: ES translations

Change-Id: Ie135371c38a93f97d96fad396a79800706706865
Notification cancellation fixes:
Permission should only allow cancellation of other app notifications, not enqueueing.
Fix checkapi breakage.

Change-Id: Idbcfd4617057984250dc4d4fa32ff55bfbb155e2
Validate restored file paths against their nominal domain

Bug 8460775

Change-Id: Ib16d740a001adf4f9cb9ccaa31066ac7cadfb430
Ensure install-during-restore is like install-then-restore

When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

(cherry picked from commit 2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)

Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
Add a delimiter between scheme and host

Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
libdrm: fix bad strncpy / snprintf calls

Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF
		Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers
		Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221
Change-Id: If386922e907567f54e26897beffaa1cfe4777896
Merge "Core: RU translation" into cm-10.1
Merge "Update German translation." into cm-10.1
Merge "Core & SystemUI: HU translation" into cm-10.1
core: SK translation

Change-Id: Ia9df7c21ab20c7b20205ccb0b7de1935e38ee9c3