Use2GOnlyCheckBoxPreference: fix NPE

Change-Id: Iacedd9f8eefb2d7f8ecdec4c0f1595448edbaf9f
Add JNI dependencies for user builds

 * JNI libs weren't being built on user builds. Fixit!

Change-Id: Ia5fa6a994c0110ca44d5b87f60563bf7d4aef3e6
Revert "Phone: Display Supplementary Service Notifications"

This reverts commit d27d964e41bd33059baecc7312b7180f25c81a7c and
restores our own SSN handling.

Change-Id: Ib61a3e94599f684e414e98969712aaa285714b79
Phone: rewrite translations

Change-Id: If4f466c64ad05cb27c10c257a89a3b8ffdbb61db
Phone: zh_CN translation

Change-Id: Ibd40b262901d561588bf593be9127d0547a7feed
Merge "Revert "Phone: Display Supplementary Service Notifications"" into cm-10.2
Merge "Phone: zh_CN translation" into cm-10.2
telephony-msim: Fix package errors

 * Move this stuff to the correct directory.

Change-Id: Icc91c0a7620857ef5b00c570ce42608f93d54dda
Phone: ES translations

- Merge CAF

Change-Id: I146337770662db2fe513d3862d16fe370164b473
Phone: HU translation

PS2: Manual rebase
PS3: Manual rebase
PS4: Translating
PS5: Translating
PS6: Correcting
PS7: Correcting

Change-Id: Ic45b534809a9c7e0fd8e05dfb249e99a07b58092
Phone: Remove double Settings alias

Causes FC due to MSimMobileNetworkSettings to be called when the
Network tile is long-pressed. The MSimMobileNetworkSettings
activity is never called from Settings, so I'm not sure about the
effect on multi-sim phones.

Change-Id: Ieefff8378887c3b05fa4b715e37f5e924854264f
Phone: IT translations

Change-Id: I02cb78f67525e213f719a7785154957af2b8c083
Merge "Phone: HU translation" into cm-10.2
Merge "Phone: rewrite translations" into cm-10.2
Merge "Phone: IT translations" into cm-10.2
Add missing break statement

* User probably doesn't intend to add additional participants to a
  conversation with someone they wish to blacklist ;)

Change-Id: If0853e2b1a5a9b89b6dc98297ca0f0bdadf9252c
Merge "Add missing break statement" into cm-10.2
Phone: Dark UI changes

Phone: TRDS goes Slim

add trds changed files to provide new UI mode engine

Change-Id: Ic24e93ffcc676da21a021417082d80f21dd84483
Provide our GlowPad
Forward port Multi-DPI Call Glowpad (AOKP)

Conflicts:
	res/layout/incall_touch_ui.xml

Change-Id: Ibcff0dce1ee683318134edda661844d75e5f4e66