Reconcile with jb-mr1-release - do not merge

Change-Id: Ifbd9be57ffd54239f7d0b9271f262042394b938e
am 9365bf1f: gps: fix for no gps signals after modem reset

* commit '9365bf1ffd633b65bad7f95af90dcbb53e41652b':
  gps: fix for no gps signals after modem reset
am c74962df: chmod uga-x

* commit 'c74962df0d30bdb176472a1775a794fd93b1cd7a':
  chmod uga-x
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie52cdeb09f0af68d833ccb50e63d72ab5a5efea2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ifb0a30557854004e5a4c90944908a91d70ceb8c6
am c5a129e1: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c5a129e11702e2878b3f17be1cfb27e841f7b9ce':
Add LIBLOC_USE_GPS_PRIVACY_LOCK needed to get GPS to work when AMSS=50000 (like on HTC Pyramid)

Change-Id: I6cd91700aac469e357f85c6645abedf41be8b0ea
AMSS 50000: use privacy lock

fixes gps on AMSS 50000 devices such as nozomi, pyramid
qcom gps: Use standalone position mode if no agps servers are set

GpsLocationProvider defaults to the MSA and MSB assisted gps modes
if the device has the capability.  This library returns that the
device has the capability.  Check to see if any agps servers are
set; if not fall back to standalone mode.

Change-Id: I54a911b028cc685b282661837f1317119713d64a
libloc: remove duplicate entry

Change-Id: I67239b322255242af799af5266b16786d83a11c2
libloc_api: xtra injection improvements

* Hold the locks only for copying buffer data to reduce the wait time
  for xtra injection.
* Remove some incorrect locks while doing deferred xtra injection.
* Switch to buffering the injection if the engine is on, as doing so
  now functions as intended.

Change-Id: I1b75945907242e960ce4b275f10b7f9f8dc17606
libloc_api: fix status reporting

Completely rework the status reporting to be more robust, and enable
report muting.

Change-Id: I740c4ef0512be36ca6a7b774e8a23cc322c14791
GPS: Fixes mFixInterval = 0 issue in gingerbread

This change modifies the HAL driver so that even if the framework
passes in 0 for fix interval we will transalate it to 1 sec
internally. This is becuase the gps engine can report positions at
the max at 1 Hz frequency.

Change-Id: I8d14ee97cf20c43d050d230b9cc9fd6deac5486c
CRs-Fixed: 279363
GPS: Changes to create loc_ni_thread locally

The thread callback reference is available only during
initialization. Hence the NI thread is created and
managed locally within libloc_api

Change-Id: Ie610143f7f0387043301e0254db4e42e0afb3e0d
GPS: Fixes a problem stopping the engine while an AGPS data is active

Sometimes the engine does not send the GPS_STATUS_ENGINE_OFF
message, so we end up blinking the GPS icon forever.  Deferring
the loc_eng_stop call until the AGPS activity is done works around
this problem.

Change-Id: I54a911b028cc685b282661837f1317119713d64a
proper fix for ISOC++11

http://awhan.wordpress.com/2012/04/17/error-unable-to-find-string-literal-operator-operator-__file__-gcc-4-7/
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_hardware_qcom_gps into jb-devel

Conflicts:
	loc_api/libloc_api/Android.mk
Merge https://android.googlesource.com/platform/hardware/qcom/gps into jb-devel
Merge branch 'cm-10.1' of git://github.com/OpenSEMC/android_hardware_qcom_gps into jb-devel