Merge "Modified call settings styles to ensure actionbar coloring is consistent with the Dialer app. This required copying over some shared style information and icons from the Dialer."
merge in master-release history after reset to master
Fixed actionbar call settings styles. DO NOT MERGE

Modified call settings styles to ensure actionbar coloring is consistent with the Dialer app. This required copying over some shared style information and icons from the Dialer.

Bug: 13364992
Change-Id: Ia64eb46cd9a224773a744d9a719cfcf94cc59d4c
(cherry picked from commit 70af2704d8d16848144b9a62be45eabed55c6e11)
am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit '08a5e780cecbba0af055d8a4f3edc74f811e7b2f':
  Fixed actionbar call settings styles. DO NOT MERGE
am 3b9bd497: am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit '3b9bd49783dd049701478e0be9788c8fdf28535e':
  Fixed actionbar call settings styles. DO NOT MERGE
am 3b9bd497: (-s ours) am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit '3b9bd49783dd049701478e0be9788c8fdf28535e':
  Fixed actionbar call settings styles. DO NOT MERGE
am c9bc881f: am 3b9bd497: (-s ours) am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit 'c9bc881fc7c33f377cc934abd6ed3bb46ffb0f6e':
  Fixed actionbar call settings styles. DO NOT MERGE
am beb825dc: am c9bc881f: am 3b9bd497: (-s ours) am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit 'beb825dc14f9244031c5171cf38f83363f58302d':
  Fixed actionbar call settings styles. DO NOT MERGE
am b8f277ac: (-s ours) am beb825dc: am c9bc881f: am 3b9bd497: (-s ours) am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit 'b8f277acedc9b36c1bd8b55f2283ea46e6b595f4':
  Fixed actionbar call settings styles. DO NOT MERGE
am ea5bbfe9: Merge "Modified call settings styles to ensure actionbar coloring is consistent with the Dialer app. This required copying over some shared style information and icons from the Dialer."

* commit 'ea5bbfe9369e0f093820eb1314958abbc6c32ac5':
  Modified call settings styles to ensure actionbar coloring is consistent with the Dialer app. This required copying over some shared style information and icons from the Dialer.
am 5a1690e7: am b8f277ac: (-s ours) am beb825dc: am c9bc881f: am 3b9bd497: (-s ours) am 08a5e780: Fixed actionbar call settings styles. DO NOT MERGE

* commit '5a1690e7eb6500c99e31cad8383ce500cec7483e':
  Fixed actionbar call settings styles. DO NOT MERGE
[USSD] Consolidate USSD messages in a single dialog box

All USSD messages (interactive or non-interactive) will be displayed
in a single dialog-box with a separator in between messages.

Bug: 12892053

Change-Id: I31bc0cd4b55492e4e62adc8c925cc0371c54f5a8
Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev
am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit '70b1f88baed5b195b33883a3253f79cd44eafca8':
  [USSD] Consolidate USSD messages in a single dialog box
am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit 'ea7a70528f83ca36ab6a35e013b2fbf478c352ec':
  [USSD] Consolidate USSD messages in a single dialog box
Import translations. DO NOT MERGE

Change-Id: I9b5503a4751a1a16eef4dea3e08f24c7405f4081
Auto-generated-cl: translation import
Update Telephony to use new Telecomm wrappers

Change-Id: I8a828a41d5e4c10e96bbe4eb36c3afc95d3e7beb
am 20bfdeb1: (-s ours) Import translations. DO NOT MERGE

* commit '20bfdeb12dd13c9a96da9bafbfb130f8ba338b46':
  Import translations. DO NOT MERGE
am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit 'ea7a70528f83ca36ab6a35e013b2fbf478c352ec':
  [USSD] Consolidate USSD messages in a single dialog box
am 1648dba0: am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit '1648dba0a8924b0339ca5331b02099c8f098494b':
  [USSD] Consolidate USSD messages in a single dialog box