merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ia36a6e2c0c59aa702c44a1a43302ff3245c498db
am 70a5cd8a: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '70a5cd8ac3982240ffc49de7619296845ebc08fd':
  Revert "Add config to turn on no-preferred-APN option."
  tilapia: enable sms support BugID:7301929
  Add config to turn on no-preferred-APN option.
  Change Bluetooth file group id to net_bt_stack for Tilapia
  Suuport the modem firmware update via OTA.
  Set lwaactivate APN to be ipv4 only.
  ril: Enable/disable IPv6 on interface layer according to apn settings
  Use tilapia based apns with att broadband as default and lwaactive set.
First cut at generating factory images for tilapia

Bug: 7252211
Bug: 4295425
Change-Id: I7e40ccf0f8c3ee2dc1301f4e6052b3d71c0f9bec
am fc4fd42d: First cut at generating factory images for tilapia

* commit 'fc4fd42dd99ae0fd58428e2769078db304c1f675':
  First cut at generating factory images for tilapia
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I8e6b252cb0d4b89351a9fbf83ac46fe94c11e886
am 0c01c2bd: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '0c01c2bd07b311019d5adea606a6c4b10f9335ba':
am b00eaba2: (-s ours) am 0c01c2bd: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'b00eaba2ef41f89b294b33e6da4de42db1a8650f':
Tilapia factory images for JOP39B

Change-Id: I63124ce3c88e49168b12ed481b81afd1c2548561
am a9f0674d: Tilapia factory images for JOP39B

* commit 'a9f0674da41b5a6f73479e697b2282a997b905e3':
  Tilapia factory images for JOP39B
Tilapia factory images for JOP40

Change-Id: I3a9273758e9f2238b0462c42292f3623db8f3cba
am e8169fc3: Tilapia factory images for JOP40

* commit 'e8169fc321c74d395fd3585fbe56cc8efa9e5ce1':
  Tilapia factory images for JOP40
Tilapia factory images for JOP40C

Change-Id: Ib6377129e023d2fe280e1d5cd64a6f7b90663ff9
am 4059680a: Tilapia factory images for JOP40C

* commit '4059680a05f885a3ac44ca181fc0df2b55b90030':
  Tilapia factory images for JOP40C
Run fastboot oem unlock before flashing

Change-Id: I035f9c905695f930b7ba4485b6a0d6d9d4cf0f60
Merge "Run fastboot oem unlock before flashing"
am d26a96ff: Merge "Run fastboot oem unlock before flashing"

* commit 'd26a96ffd83dd91b4e1b7110b99c6dba6497250b':
  Run fastboot oem unlock before flashing
JOP40D factory images for Tilapia

Change-Id: Iec57e79a01095f6bc3ef3a09c09bc8c40e4a68b4
am d753822e: JOP40D factory images for Tilapia

* commit 'd753822ea1fe658e0572d4492581eda54655ee31':
  JOP40D factory images for Tilapia