Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into HEAD
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into HEAD
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Core: HU translation

PS2: Correcting...

Change-Id: I3962a875e71348a4506a5409db4b2d357838ee30
Merge remote-tracking branch 'cm/cm-10.1' into HEAD
Core: RU translation

Change-Id: If8a8a0646c12abc8bbc5a45ea174229974c48232

Patch Set 2: Update translations

Change-Id: I88d0fb8af7c0de9f3f98b102d1b9a85d2fb7bd65

Patch Set 3: Update translations

Change-Id: Ie1c7db36fa1d8797bf8a829035fda85e3937d759
Base: CS translation

- new perm - intercepting SMS
- unified privacy guard translation

Change-Id: I2abf86f339ad88fbae5407b2580458a72f6f82fb
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Merge "Core: HU translation" into cm-10.1
update SystemUI's proguard.flags

Change-Id: I5aa73eddd3fea6cddeddaf94e202d8de870e7df5
Clean up unnecessary backslashes

* Last line in a PRODUCT_COPY_FILES block shouldn't end with backslash

Change-Id: I57b4914048a2a17ff98057844941898b682dbcd5
Ignore null stylus gesture settings

If the user performs a stylus gesture that has not been configured in
the settings at all, the gesture filter would incorrectly interpret the
setting's null value as an app launch action.

Change-Id: If7f600a688bb7b5e0a9a2e912c3d6183a9c9a69e
Allow multiple emulated storages at the same time.

Only do multiuser mapping for primary emulated storage as per google docs.
Allow all non-primary emulated storage to have id other than 0 so that
it could be distinguished from the primary volume.

Change-Id: I7b70b9067fd6211055fb9074710f48107d7b0e8e
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1