am 8fcd6951: am db2af234: Merge "Update use of A-GPS modes in...
am 8fcd6951: am db2af234: Merge "Update use of A-GPS modes in GpsLocationProvider b/20664846" into mnc-dev
* commit '8fcd6951':
Update use of A-GPS modes in GpsLocationProvider b/20664846