merge in klp-release (no-op)
Exclude SipCallOptionHandler from recents

This is not an activity with UI and should not appear in recents.

bug:11257436
Change-Id: I6009379ad2771dce7a81272ce8f90717b9f52b6a
Import translations. DO NOT MERGE

Covers Latest translations and fix for 47183615370850000 and 8559146795026261502

Bug: 11140622
Change-Id: Ia411592728b81bb529f7e0cb631da3886b0ea6e6
Auto-generated-cl: translation import
Merge "Exclude SipCallOptionHandler from recents" into klp-dev
Import translations. DO NOT MERGE

Change-Id: I2dc6758428196f569c1fd99f4530f3fc0286b4da
Auto-generated-cl: translation import
Fix network mode not to display selected radio button

If select 3G, modem can report various 3G modes, i.e.,
WCDMA pref, UMTS, UMTS only. Device should handle them.

Bug: 11244807
Change-Id: I88ff0b338ba74f1725779f0c5fe0e9ae98b95efc
Update strings for preferred networks selection menu

Change to use string resources.
Need to translate preferred_network_mode_title,
preferred_network_mode_dialogtitle, network_lte,
network_4g, and network_global.

Bug: 11193632
Change-Id: I68786d503cf8b5c2452d21d61c15f5772670cc74
Merge "Fix network mode not to display selected radio button" into klp-dev
Merge "Update strings for preferred networks selection menu" into klp-dev
Phone: Display message to indicate PIN/PUK status changes.

Changes done to display retry counter on wrong entry of PIN1,
and message to indicate Code accepted/PIN1 blocked during
PIN1 verification as per certain carrier requirements.
PhoneApp: Add APIs that report actual error code on PIN/PUK operations
The current APIs that are used to verify the PIN and PUK only convey
whether the operation succeeded or failed. As a result on ANY failure
clients ask the user to re-enter the PIN.
Add 2 new APIs that report the actual error code in case of failure.

Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
Import translations. DO NOT MERGE

Change-Id: Ic6f660ba161fbf02939ea5f126f1983b88a6f6c4
Auto-generated-cl: translation import
Display carrier settings menu in GSM Phone if needs

Some carriers use their setting menu in CDMA. Furthermore, use in GSM
when roaming.
So change to show carrier settings menu in both CDMA and GSM Phone.

Bug: 11354773
Change-Id: Ifb329971df16351768fe14e6801cc83631e60971
Merge "Display carrier settings menu in GSM Phone if needs" into klp-dev
Import translations. DO NOT MERGE

Change-Id: Ie834e8dc078f3f61a65a3f65cea40a325a615987
Auto-generated-cl: translation import
Merge "Phone: Display message to indicate PIN/PUK status changes." into klp-dev
Updating reconnect retry code for InCallUI.

After we failed to retry our maximum number of times, we never retried
again until the device was restarted.  This is because the only place
we reset the retry count was on successfull connection.

Changes:
1) Dont stop trying to connect as long as there is a live call. Instead,
move to a much slower 30-second retry interval.
2) Reset the retry count when a new incoming call comes in.

bug:11275842
Change-Id: Iacc223dddb5a8fd071637040f8e75a7e6f57d9a5
Import translations. DO NOT MERGE

Change-Id: I115a0c5b0e5bb822ab43d4cd113e89724f0102ac
Auto-generated-cl: translation import
Fixes bug in CDMA phones' missed call notification

- There was inconsistency between CallNotifier and NotificationMgr in
  which variable to set to "Private number" when the number has its
  representation form set.
- This fixed the problem in the missed call case, but we should
  re-examine our logic to set the "Private number" string in all our
  projects.

Bug: 11275098
Change-Id: I5bb955ebdfa16860cfcb1494ba82789fb40d79c2
Merge "Updating reconnect retry code for InCallUI." into klp-dev
Merge "Fixes bug in CDMA phones' missed call notification" into klp-dev