am 3a80fc38: (-s ours) Import translations. DO NOT MERGE

* commit '3a80fc38847f405cfb5f992ddb4654c0a30a1af1':
  Import translations. DO NOT MERGE
am 422c2f54: Fix phone in PDK

* commit '422c2f542697619a5084313e9d7c5845a00b214f':
  Fix phone in PDK
am 6952672d: Merge "Stop in call service when there are no calls." into klp-dev

* commit '6952672d7c9a8a338729b995fe3d3c8fc210c90d':
  Stop in call service when there are no calls.
am 45277026: Adds separate conference call function.

* commit '4527702619ef22da25dae00173675a4468a1314c':
  Adds separate conference call function.
am 0ce0e859: Adds package picker for sending text messages.

* commit '0ce0e85976ad4e1352ac3ec1adab42f8097ce8bf':
  Adds package picker for sending text messages.
am 55d3006e: Merge "Porting DTMF post dial wait feature." into klp-dev

* commit '55d3006ee12a004b3293b29c731854c3656904ca':
  Porting DTMF post dial wait feature.
am 1d154f78: Merge "HFA support in services/Telephony for provisioning CDMA devices." into klp-dev

* commit '1d154f788febeb5047f4a2514119d29b7d837c8a':
  HFA support in services/Telephony for provisioning CDMA devices.
am f2d0cac8: Fix crash in settings when hitting up

* commit 'f2d0cac860a18381abbe5b60a8aca0365e2802aa':
  Fix crash in settings when hitting up
am d7aa1383: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'd7aa1383f6710bf77abb5aafb150e76e6c5dc68a':
  Import translations. DO NOT MERGE
am 397b8b02: Quick response overflow menu string change

* commit '397b8b0222aa84ffcfbd1b9a150319a0dd22d6a2':
  Quick response overflow menu string change
am 88bf3cc2: Change call settings style to be consistent with dialer

* commit '88bf3cc283597b04fe500e541c1491941b5dc121':
  Change call settings style to be consistent with dialer
am bb37fb43: (-s ours) Import translations. DO NOT MERGE

* commit 'bb37fb43fa9d3d269e897df0da3b4937c51f3b11':
  Import translations. DO NOT MERGE
am 8d1de349: Merge "Do not create incoming/disconnected calls on update." into klp-dev

* commit '8d1de3499e10b571b64ba76a1e05086a93131400':
  Do not create incoming/disconnected calls on update.
am afce7ad2: Fix NPE when no pending intent was given

* commit 'afce7ad2c2c347bb30119e224cd414a9a6339060':
  Fix NPE when no pending intent was given
am 04ff6961: Merge "Update TeleService callback and reduce update frequency." into klp-dev

* commit '04ff6961859dde76c64e1f14e95741d7c7956a51':
  Update TeleService callback and reduce update frequency.
am d20df83f: Change settings font

* commit 'd20df83f9954e8018b5ef03dc35c32979ef248bc':
  Change settings font
am 3bca885a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '3bca885ab6e47affba2193809be2ebf93dbdd185':
  Import translations. DO NOT MERGE
am af2fd0ad: Adds more phone states and rules on changing them.

* commit 'af2fd0ad9669ce110dfcf13bb7bf996e8a387a91':
  Adds more phone states and rules on changing them.
am bef8881a: Merge "Fix parent call not being identified as a conference call" into klp-dev

* commit 'bef8881a28cc796ba87379fbc5d279620a7e5d84':
  Fix parent call not being identified as a conference call
am 69050202: Fixes Conference call map null pointer exception

* commit '69050202ab926539f7b1d3f7efd9f688d5fbf8d3':
  Fixes Conference call map null pointer exception