base

am 6c6dbde8: am 3de1584d: Merge "Allow carrier specific requirement on GPS features to be specified through a dedicated configuration key. Currently, carrier requirement is specified through CAPABILITIES key, whose original purpose is to indicate the capability of the

* commit '6c6dbde8cf134b11f9ac72cd1f61bade9cf4fb00':
  Allow carrier specific requirement on GPS features to be specified through a dedicated configuration key. Currently, carrier requirement is specified through CAPABILITIES key, whose original purpose is to indicate the capability of the hardware, not to enable/disable features in GPS HW. With this fix, carrier requirement on GPS features can be specified properly without messing up with the real capability. This will satisfy VzW, Sprint and USC's requirement on SUPL mode, without sacrificing the capability of HW geofence.