Merge remote-tracking branch 'aospa-legacy/kitkat' into kitkat-legacy-staging
Telephony: update number of missed calls in notifications

Change-Id: I67a167340dfa4d8d85535a7d72959555cb930a9c
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
FDN: Don't crash when attempting to change the PIN2 without a SIM

Catch the absent SIM runtime exception and pop up a "No SIM" toast
instead

Change-Id: I16fb3db17a52efe25bcc5397845d1b099737a363
Telephony: Update ActionBar to match Settings

Even though Telephony is a seperate app, it is accessed
directly in the Settings app and has a different action bar to
all the screens in the Settings app.

Change-Id: I328fd1cdc55dafc53b8b2f99efffa6b74bf83853
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging
MSIM(DSDA): Use conversation sub to maintain LCH properly

Use conversation sub to maintain LCH properly

Change-Id: I2307d04a9e32a43234a5e56d995e20db464a6187
CRs-Fixed: 659123

Conflicts:
	common/src/com/android/services/telephony/common/ICallCommandService.aidl
Merge remote-tracking branch 'aospal/kitkat-legacy-staging' into kitkat-legacy