merge in klp-release (no-op)
Import translations. DO NOT MERGE

Change-Id: I68c866afbae3099627a843b5b07c6bb6dac065da
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into klp-dev
Import translations. DO NOT MERGE

Change-Id: Id9ae995c1bfe3e23f38302d4dd54652e1c186cd7
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I3e0fb5f09759f0d666697b8793efedc5967bc7d1
Auto-generated-cl: translation import
Fix inconsistent back button behavior

By default, a press of the back button will only take effect when the
button is successfully released (the user releases the button while
still focused on it), not when the button is still triggered and pressed
down. To avoid this inconsistent behavior, execute the custom back
logic in the onBackPressed callback instead of onKeyDown.

Change-Id: Id516bc523b625a7ca42ea3ff580892cdf28f770f
ClassZeroActivity: Resolve some possible NPEs, and refactor common code

Match up to the final version merged upstream

Change-Id: I215188f5ea508b3c0b69189c1bf6ccc7601eed7b
Android denial of service attack using class 0 SMS messages

Bug 9702645
Bug 11970403 - Change to ClassZeroActivity to singleTask

Cherry pick the change from master.

Making every AlertDialog immediately visible can lead to exhaustion
of graphics-related resources, typically memory, resulting in a
broken bufferqueue/hw renderer, and subsequent system crash.

Make ClassZeroActivity a singleTask activity, and queue incoming
messages if one is already being displayed.

Change-Id: I0aef7b857364acc404e79581ba5e503571065483
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
Mms: IT translations

Change-Id: I12466ae82c343286f3d8bd1770e8539abf6f624b
Mms: PT-BR Translations

Change-Id: If126d4f6536d99d3006b3b8cb26ac20ed89cc37e
Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1

Change-Id: Ie8e43fb971183f172fa8f2112b0cc103be6614f6
Mms: fix quick message layout on 320dp

match_parent no longer works properly on 4.4 for some reason, so
we hardcode it to 300dp.

Also cleaned up how 360dp devices are handled to avoid duplicating
layout.

Before: http://imgur.com/UKo4aUL
After: http://i.imgur.com/Eu6WMnm

Change-Id: I722e97ada7a434315d0c603c6eede3e8ed16b1e4
Merge "Mms: fix quick message layout on 320dp" into cm-11.0
Merge "Mms: IT translations" into cm-11.0
Mms: Remove aapt warnings in DE

Change-Id: I7dca3f00d233a62f8b423d5316e30791123aa5c8
Mms: Option to delay SMS Sending

Add feature to delay SMS sending, user being able to cancel
SMS sending by touching the SMS, until set duration is elapsed.

Follow-up of http://review.cyanogenmod.org/#/c/36178/
    (and http://review.cyanogenmod.org/#/c/35231/) on cm-10.2 branch

Change-Id: I09dd045bde30c19c7552ee57d55a4a9434e98712
Mms: Update DE translation

Change-Id: I00b9794737e5e194c135f9c6a881b11a34c16ab3
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0