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
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
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
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
am 03601f13: Merge "Call UI not showing for MO/MT call till pwr cycle"

* commit '03601f133c0eeb099db389952fdad2f8061f7d92':
  Call UI not showing for MO/MT call till pwr cycle
am 18636118: am 1648dba0: am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

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

* commit '2425b0f354ace1d92345d5d4c2c25491774ee0d1':
  [USSD] Consolidate USSD messages in a single dialog box
am 023e003d: am 2425b0f3: am 18636118: am 1648dba0: am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit '023e003d99a37c9ef715b5eea8296e13c628b06b':
  [USSD] Consolidate USSD messages in a single dialog box