am 63e3dc43: (-s ours) am 3dac3016: am 65102c39: am 47210994: (-s ours) am c2f34af0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63e3dc43c4bac981341d7cc5d93be81fc1092b9d':
am 34ee0955: Revert "remove loc_api from hardware/qcom/gps"

* commit '34ee09551764b045fdc02df754157473125edf60':
  Revert "remove loc_api from hardware/qcom/gps"
am 52f4c8ca: add LOCAL_MODULE_OWNER := qcom to gps modules

* commit '52f4c8ca93985643a6aac0ba0dbdc3eac532ba49':
  add LOCAL_MODULE_OWNER := qcom to gps modules
am ade0338d: moved most of the GPS HAL back to aosp

* commit 'ade0338d23f65f84b098307df0b853b7837ded76':
  moved most of the GPS HAL back to aosp
am c65fed03: gps: Runtime detection between apq v/s mdm gps support

* commit 'c65fed03538cb5e4a5b62d3ca114ff3cc5e87e60':
  gps: Runtime detection between apq v/s mdm gps support
am ce5efcc5: Add liblog

* commit 'ce5efcc57fe0e7ad6650f17ace2cf391fde72399':
  Add liblog
am 2a9f38e7: Merge "gps: geofence hal integration" into jb-mr2-dev

* commit '2a9f38e7bfa49b63775a4d1436f1c3e5f0f97d26':
  gps: geofence hal integration
Merge latest gps hal

Merged at commit-id 782431aff037174b5d6bf533975a05aafff98ed2

Change-Id: Icf77a4758601b107251860544e98a363307d1fff
Include this Android.mk only if BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE is defined

This fixes build breakages in non-qcom devices.

Change-Id: Idfea07001ea926837264e04ce0f221351aaea7f5
Bug fixed in AGPS checks

Fixed conditional check from MSA|MSA to MSA|MSB.

Change-Id: I7931563e08c5c875b49cc9ada2969a34373a2890
Fix inject NTP time fail

b/11524262 - Can’t inject NTP time to improve GPS Time to first fix (TTFF)
Change-Id: Id2c00d681351f9264225389869192f2e34a143f0
Fix LocSvc log spam issue

Change logging the "default implementation invoked"
from Warning to Debug level.

bug 11358351

Change-Id: I89d750ab76f27c4ca44bdfc4bd110f61fc93d6f7
Revert "Fix inject NTP time fail"

Bug: 11642521

This reverts commit 04bfb8ffd5695f666c37970cd7173f749327f5fb.
Resolved On-Demand XTRA time injection issue

Resolved issue where XTRA data was being requested instead
of time during On-Demand time injection.
CRs-Fixed: 530415

Bug: 11907247
Change-Id: Ibf057073dc4eddc011f5df5c13d60eb552eec8c9
Resolved On-Demand XTRA time injection issue

Resolved issue where XTRA data was being requested instead
of time during On-Demand time injection.
CRs-Fixed: 530415

Bug: 11907247
Change-Id: Ibf057073dc4eddc011f5df5c13d60eb552eec8c9
am a41314bd: Resolved On-Demand XTRA time injection issue

* commit 'a41314bdce2ab8478bc8c538ec89401f695f9d6f':
  Resolved On-Demand XTRA time injection issue
Add option to fallback to LocApiV02

In case the lbs or izat libs are not present, fall back
to LocApiV02 to obtain the qmi client handle. This change
will enable basic GPS functionality without lbs or izat lib
dependencies.

Change-Id: Ic2c8418d785e891ad0a660a615cd5111fafc4ff2
Add IPv6 support to GPS HAL.

Change-Id: I4db1fce69bccd32047bc467d1274fa51768b72a5
Revert "Changes for GPS HAL compilation"

This reverts commit 627008708a92ff909caa97f7e183514a32db8c94.

Change-Id: I50618231719788560d0e4cdf60986f0884a68496
Merge "Revert "Changes for GPS HAL compilation""