am 2c97fac7: am 06ed4317: merge from open-source master
am f1aea717: am 975d455b: merge from open-source master
am 67605a26: am 8ff3733d: merge from open-source master
am 36fb13bc: am 997ba30f: merge from open-source master
Tweak the layout of the in call screen's provider overlay

Bug: 2239684

Tweak the call provider overlay when a call is handled by another
provider, such as Google Voice.  The font is now smaller, and the
icon is also smaller and aligned with the left side of the panel.

Change-Id: I9ca0874cfbabc3905fa322fc171d3f8d666433fa
am 107d4cf6: am a241ed1c: am 77350aab: FIX 2684297: Phone app crash when rejecting second incoming call using BT
am 3f614514: am a7c89b53: am 19d9218d: Merge "Import revised translations" into froyo
Text color of the in call buttons now changes when the buttons are focused

Bug: 2353515

Now the text on buttons on the in call screen turns black
when focused, in the same way that text in list views and other
places does.

Change-Id: If696a6dd57710e51f5636182c5e5b8daed3df73b
Merge "Text color of the in call buttons now changes when the buttons are focused"
Fix a failure on my previous checkin

Corrected fix for Bug: 2239684.
I messed up a line in my last checkin, so that
the layout_width of a textview was not specified.

Change-Id: Ib359f72afe8e153316a54c81314fb4fe32e0f937
Merge commit 'd583483fed1b9cda57d1e14b0b2a87e5d7c9dac5' into oxygen_4.3

* commit 'd583483fed1b9cda57d1e14b0b2a87e5d7c9dac5':
  Fix a failure on my previous checkin
  Text color of the in call buttons now changes when the buttons are focused
  Tweak the layout of the in call screen's provider overlay