9fe51b7593
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAlQYPVMACgkQoUgPZYCpAfFH4gCeMO6B2RcmkK4FiGKyMAGyby70 q1kAoKNW3qC2PpZ2TR02ASrbkjfuyjJv =+Hrp -----END PGP SIGNATURE----- Merge tag 'AU_LINUX_ANDROID_KK.04.04.04.010.161' into HEAD AU_LINUX_ANDROID_KK.04.04.04.010.161 based on quic/aosp/kk Conflicts: loc_api/libloc_api_50001/loc_eng.cpp loc_api/libloc_api_50001/loc_eng.h Change-Id: Ib51f82aa83a2aa7ea63a10efffe5e7eef8a5d135 |
||
---|---|---|
.. | ||
Android.mk | ||
gps.conf |