-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlTQKUkACgkQoUgPZYCpAfGAUgCgyH0kEyUtVhZ09+T3w4VfnZqK
Id8An3JkWK9QhlXZ9Q2zT8T7LR5/T2ls
=8mx/
-----END PGP SIGNATURE-----
Merge tag 'AU_LINUX_ANDROID_LA.AF.1.1.05.00.02.164.175' into 111
AU_LINUX_ANDROID_LA.AF.1.1.05.00.02.164.175 based on quic/aosp/LA.AF.1.1
* tag 'AU_LINUX_ANDROID_LA.AF.1.1.05.00.02.164.175':
GNSS measurement
Added new events and masks for GDT AP
gps.conf parameters are in sap.conf table
Enable "auto" target for APQ8960 Automotive ADP platform
support reinjecting supl url for sim hot swap
Remove Redundant Log
Report 2D speed rather than 3D speed.
Conflicts:
core/gps_extended_c.h
Change-Id: Ibe1207ac07a2931003f5fa34ae68d8c1e6512eeb