android_device_xiaomi_sdm66.../loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue
Dante Russo 7118024952 Merge jb into jb_2.5
Features ULP, IPV6, DELEXT disabled

Conflicts:
	loc_api/Android.mk
	loc_api/libloc_api-rpc-50001/*
	loc_api/libloc_api_50001/*
	loc_api/loc_api_v02/*
	loc_api/ulp/inc/ulp.h
	utils/*

Change-Id: I846352d0addca89d4ffc3b114b774926b23e930d
2012-12-14 16:45:15 -08:00
..
rpc_inc Merge jb into jb_2.5 2012-12-14 16:45:15 -08:00
src Merge jb into jb_2.5 2012-12-14 16:45:15 -08:00
Android.mk Merge jb into jb_2.5 2012-12-14 16:45:15 -08:00