am 3ed1461d: (-s ours) am f088ef91: (-s ours) Reconcile with jb-mr2-zeroday-deb-release - do not merge

* commit '3ed1461d3589a38e162414e50371c621ea17e591':
  Restart, cleanup or retry inactve connections.
am 35c5dd72: (-s ours) am 38aaaa64: (-s ours) am 1b4c3db6: Merge "RIL: Support SMS on IMS, DO NOT MERGE" into jb-mr2-dev

* commit '35c5dd72d8a28a384e54393955e60a352a425f7e':
  RIL: Support SMS on IMS, DO NOT MERGE
am 3492c6e5: Change PDP_FAIL_SIGNAL_LOST to be retryable.

* commit '3492c6e5917828645feb3dba4618629929a43ab1':
  Change PDP_FAIL_SIGNAL_LOST to be retryable.
am a18b9d1e: RIL: Support SMS over IMS

* commit 'a18b9d1e1a014290691d63a7f335085dadc83e46':
  RIL: Support SMS over IMS
am 865ce3b4: Fix documenation IMS registration state.

* commit '865ce3b4a2ba0b3a31421ca671f4d6c5595f8690':
  Fix documenation IMS registration state.
am a8975de9: am 56865265: am 478bfb9a: Merge "Stop the kernel complaining about rild."

* commit 'a8975de92f1bba7672d447819e7ddc0f08ce8275':
  Stop the kernel complaining about rild.
am 72356f14: am 6b49c024: am 740edfcf: Merge "Remove an outdated hack."

* commit '72356f14525d260f0e8ed38bd9f8376f535c02d0':
  Remove an outdated hack.
am 12131041: am 6a775fe2: am eb90dbe8: Merge "Remove references to <linux/omap_csmi.h>."

* commit '121310411fedd2b637a5e6986c10cbf517628b52':
  Remove references to <linux/omap_csmi.h>.
am 0a8b1f4b: am 2c464b0d: Merge commit \'a18b9d1e1a014290691d63a7f335085dadc83e46\' into HEAD

* commit '0a8b1f4bf45cdd0eb65ed6c06e65398d0f3b4393':
am 7a74bcfd: am d78be248: Merge "RIL changes for supporting generic SIM communication."

* commit '7a74bcfda5a455f872024b34eea1f1eebb5a84d4':
  RIL changes for supporting generic SIM communication.
am 15bb22ae: am 2e52ae0e: Merge commit \'865ce3b4a2ba0b3a31421ca671f4d6c5595f8690\' into HEAD

* commit '15bb22aee5926a8c8d87842dc9d82a3ffd44ea9b':
am f0cce223: am dbff9519: Merge "Send unsol_sim_status on radio_state change"

* commit 'f0cce223bc5e741d7ecc72aa118ee256bd00abb0':
  Send unsol_sim_status on radio_state change
am bd7603d8: am 710f0c82: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."

* commit 'bd7603d8fcb16d039dff2d4e8035a2b5fa73460a':
  Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
am 169e3195: am af03f928: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

* commit '169e3195c45cc50ed315a2a48aa80a58818303da':
  Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
am 05eb2d71: am c4801e78: Merge "Fix parameter mismatch between header and implementation"

* commit '05eb2d71de4caa1226b4b4898414042abfd9d539':
  Fix parameter mismatch between header and implementation
am 091ed337: am 21538d94: Merge "Fix pthread_create error handling in ril."

* commit '091ed337b14b6e5bcf35286d8ca5a3457cafa7ce':
  Fix pthread_create error handling in ril.
am cc1983a7: am dcb3334c: Merge "Fix pthread_create error handling in ril harder."

* commit 'cc1983a73ada8546905d6174b0d694b88f5f1916':
  Fix pthread_create error handling in ril harder.
am eacd3caa: am 2f29fdb8: Merge "Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE"

* commit 'eacd3caa7a8fc01cedbe82fafd87be131ad231a8':
  Set USE_NP based on HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE
Add new RIL commands to read, write, and reset NV items.

Add new RIL commands to read, write, and reset NV items,
including the CDMA Preferred Roaming List (PRL).

Used for device configuration by some CDMA operators.

Bug: 12864208
Change-Id: I792e272438b56bca725e6c034baac19244e5563f
am ebdf40e6: Merge "reference-ril: fix LP64 warnings"

* commit 'ebdf40e65a17e8758c059a736425cd47563cdace':
  reference-ril: fix LP64 warnings