am 45ac967b: (-s ours) am 02b92e38: (-s ours) Reconcile with jb-release - do not merge

* commit '45ac967b8529c7e0d15923b1b6cccc655d29566b':
  SMS isn't converted to MMS even after 7 segments of messages
am be2fbc8a: (-s ours) am 47fa7eef: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'be2fbc8adb94a2bc79a7e73a4e54070c1a34385f':
am 6d421ec1: Merge "auto-generated blob list" into jb-mr1-dev

* commit '6d421ec10a439490cbe0c13ad51bd7c8f3d18565':
  auto-generated blob list
am 61c63fa6: use bsdiff not imgdiff to compute radio diffs

* commit '61c63fa6b3ba02e8762660c626bb4f9c2341d71f':
  use bsdiff not imgdiff to compute radio diffs
am 670d8280: Add support for per device bluetooth configuration.

* commit '670d8280ad0996f083add9dcdbcf7c9d22fe5158':
  Add support for per device bluetooth configuration.
Set preferred network mode to global for this device

Set ro.telephony.default_network to Global so that the Settings
database can be updated after first power-up with proper preferred
network mode

Change-Id: If2cf0cb324cdc8e4aade637160f234a37893de04
am d32f4496: (-s ours) am d3a5d2a6: (-s ours) Reconcile with jb-release - do not merge

* commit 'd32f4496b6392aa5dce709f66fd253b696dabd64':
am d32f4496: (-s ours) am d3a5d2a6: (-s ours) Reconcile with jb-release - do not merge

* commit 'd32f4496b6392aa5dce709f66fd253b696dabd64':
am 853a7f31: auto-generated blob list

* commit '853a7f31a8927277ddab07f766fbd1edfe35f075':
  auto-generated blob list
auto-generated blob list

Bug: 4295425
Change-Id: Ibc23b361559d114775a0bdac1bbfc284232baaa3
am 853a7f31: auto-generated blob list

* commit '853a7f31a8927277ddab07f766fbd1edfe35f075':
  auto-generated blob list
am 50c4ce78: am 1ba62ba2: (-s ours) Self-extractors for JZO54G

* commit '50c4ce7805d1e024014d0f7b5397d2df05a64bfb':
  Self-extractors for JZO54G
am 50c4ce78: am 1ba62ba2: (-s ours) Self-extractors for JZO54G

* commit '50c4ce7805d1e024014d0f7b5397d2df05a64bfb':
  Self-extractors for JZO54G
am e57c424d: Update self-extractors for JOO75

* commit 'e57c424d2e05a5df26290a71faf9f14b1f7172e1':
  Update self-extractors for JOO75
am e57c424d: Update self-extractors for JOO75

* commit 'e57c424d2e05a5df26290a71faf9f14b1f7172e1':
  Update self-extractors for JOO75
am 498ffc6b: auto-generated blob list

* commit '498ffc6b74923a5b4cd416679a0398dd30e84898':
  auto-generated blob list
am 498ffc6b: auto-generated blob list

* commit '498ffc6b74923a5b4cd416679a0398dd30e84898':
  auto-generated blob list
am 1e3ac66d: auto-generated blob list

* commit '1e3ac66db5cab2f37723cb1e7d2eaf85378963d2':
  auto-generated blob list
am 1e3ac66d: auto-generated blob list

* commit '1e3ac66db5cab2f37723cb1e7d2eaf85378963d2':
  auto-generated blob list
am 364a71e4: (-s ours) am 0db2c18f: (-s ours) Reconcile with stage-aosp-jb-release - do not merge

* commit '364a71e44f9d28d258a552e614d2a1a3f1743f92':
  Remove version requirements for AOSP