Zhoulu Luo 9fe51b7593 AU_LINUX_ANDROID_KK.04.04.04.010.161 based on quic/aosp/kk ... -----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		2014-09-18 12:26:41 -07:00
..
libloc_api-rpc	Merge branch jb_mr1 into jb_2.6	2013-06-11 14:58:24 -07:00
libloc_api-rpc-50001	Inject feature config	2014-05-05 12:10:59 -07:00
libloc_api_50001	AU_LINUX_ANDROID_KK.04.04.04.010.161 based on quic/aosp/kk	2014-09-18 12:26:41 -07:00
Android.mk	Revert "Avoid GPS build for MSM8916 64bit"	2014-06-17 11:18:48 -07:00
NOTICE	Merge branch jb_mr1 into jb_2.6	2013-06-11 14:58:24 -07:00