merge in ics-release history after reset to master
DO NOT MERGE Cherry-pick "Enable logging in the phone app for a few important telephony actions"

Slightly turn up logging verbosity to help debug a few strange
telephony-related problems that have started happening recently, for
example bugs 5313580, 5313015, and 5331988.

TESTED: Verified the new log messages, made sure no PII is leaked.

Bug: 5313580 (and others)
Change-Id: I22695577a642c6f047b102f02b3f121e46d24ac3
Merge "Update code to use location aware isEmergencyNumber."
am aa7a5e8f: Merge "Update code to use location aware isEmergencyNumber."

* commit 'aa7a5e8ffbceca40991631e72fd94a0d9db357ea':
  Update code to use location aware isEmergencyNumber.
am 23d416d9: (-s ours) DO NOT MERGE Cherry-pick "Enable logging in the phone app for a few important telephony actions"

* commit '23d416d92d99bc258a82d3e3d590783766898184':
  DO NOT MERGE Cherry-pick "Enable logging in the phone app for a few important telephony actions"
am 675adbc3: (-s ours) am 23d416d9: (-s ours) DO NOT MERGE Cherry-pick "Enable logging in the phone app for a few important telephony actions"

* commit '675adbc33882004a98c1b0e5ae9862b4ff154a99':
  DO NOT MERGE Cherry-pick "Enable logging in the phone app for a few important telephony actions"
Enable in-call "End" button even if phone is idle

We've gotten occasional reports of touch input problems leaving you
"stuck" on the in-call screen.  By keeping the "End" button always
enabled, we'll now be able to tell from the logs whether touch input is
totally broken, or if instead we just got stuck on the InCallScreen even
though the phone was idle.

We might *also* want to bail out immediately in this case (to make it
easier for the user to recover if we *do* get stuck on the InCallScreen
with the phone IDLE), but I'm not enabling that yet since it might mask
some other bug.  I added a TODO comment about that, though.

Bug: 5331988
Change-Id: I1a297200898f9c1477bd556b2107c80e52b542e5
am 3bb74765: Enable in-call "End" button even if phone is idle

* commit '3bb74765a9dcfd981637234505ab5a40f3be4f9e':
  Enable in-call "End" button even if phone is idle
am 9631acf9: am 3bb74765: Enable in-call "End" button even if phone is idle

* commit '9631acf938ae97219d7e7c4daf33005490c57ed0':
  Enable in-call "End" button even if phone is idle
Fixes for the InCallTouchUi "extra button row"

Some UI fixes for the row above the "End" button that's used for either
"Merge calls" (CDMA) or "Manage conference" (GSM).

The fixes:
 - make background opaque, so contact photo doesn't show through
 - make the whole row clickable, not just the icon
 - fix the text style to match the spec

TESTED: the CDMA "Merge calls" button (on a mysid device).

Bug: 5280816
Change-Id: I92b31c10b9dc3058301f3c64f730b60c1cdd67ac
merge in ics-release history after reset to master
Import revised translations.

Change-Id: Ie9705155e915c314cb64584b99c326b1a323b6af
Merge "Import revised translations."
am cf2882ee: Fixes for the InCallTouchUi "extra button row"

* commit 'cf2882eef2de01b4cb498c4d81852bdfbf681ae7':
  Fixes for the InCallTouchUi "extra button row"
am 78d2521d: Merge "Import revised translations."

* commit '78d2521d9b5e89fd79378550421446889f9b850e':
  Import revised translations.
Import revised translations.  DO NOT MERGE

Change-Id: Idc8b8433f17900831f03cae36fb98f48e8ccd7f1
am 76af83b8: (-s ours) Import revised translations.  DO NOT MERGE

* commit '76af83b82a485608610e0654a7d5b2f6b6b51d2a':
  Import revised translations.  DO NOT MERGE
am 71dceebd: am cf2882ee: Fixes for the InCallTouchUi "extra button row"

* commit '71dceebd036a40c81a0ff1360429901833573d28':
  Fixes for the InCallTouchUi "extra button row"
am e8716924: (-s ours) am 76af83b8: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'e8716924f47378c96d646c79f83e64252fc59474':
  Import revised translations.  DO NOT MERGE
merge in ics-factoryrom-release history after reset to ics-factoryrom