fix merge derps
	deleted:    AsantiKeypad/res/values-af/strings.xml
	deleted:    AsantiKeypad/res/values-ar/strings.xml
	deleted:    AsantiKeypad/res/values-ca/strings.xml
	deleted:    AsantiKeypad/res/values-cs/strings.xml
	deleted:    AsantiKeypad/res/values-da/strings.xml
	deleted:    AsantiKeypad/res/values-de/strings.xml
	deleted:    AsantiKeypad/res/values-el/strings.xml
	deleted:    AsantiKeypad/res/values-es-rXA/strings.xml
	deleted:    AsantiKeypad/res/values-es/strings.xml
	deleted:    AsantiKeypad/res/values-et/strings.xml
	deleted:    AsantiKeypad/res/values-fi/strings.xml
	deleted:    AsantiKeypad/res/values-fr/strings.xml
	deleted:    AsantiKeypad/res/values-gl/strings.xml
	deleted:    AsantiKeypad/res/values-hr/strings.xml
	deleted:    AsantiKeypad/res/values-hu/strings.xml
	deleted:    AsantiKeypad/res/values-in/strings.xml
	deleted:    AsantiKeypad/res/values-it/strings.xml
	deleted:    AsantiKeypad/res/values-iw/strings.xml
	deleted:    AsantiKeypad/res/values-lb/strings.xml
	deleted:    AsantiKeypad/res/values-lt/strings.xml
	deleted:    AsantiKeypad/res/values-nb/strings.xml
	deleted:    AsantiKeypad/res/values-nl/strings.xml
	deleted:    AsantiKeypad/res/values-pl/strings.xml
	deleted:    AsantiKeypad/res/values-pt-rBR/strings.xml
	deleted:    AsantiKeypad/res/values-pt-rPT/strings.xml
	deleted:    AsantiKeypad/res/values-ro/strings.xml
	deleted:    AsantiKeypad/res/values-ru/strings.xml
	deleted:    AsantiKeypad/res/values-si/strings.xml
	deleted:    AsantiKeypad/res/values-sk/strings.xml
	deleted:    AsantiKeypad/res/values-sr/strings.xml
	deleted:    AsantiKeypad/res/values-sv/strings.xml
	deleted:    AsantiKeypad/res/values-tr/strings.xml
	deleted:    AsantiKeypad/res/values-uk/strings.xml
	deleted:    AsantiKeypad/res/values-zh-rCN/strings.xml
	deleted:    AsantiKeypad/res/values-zh-rHK/strings.xml
	deleted:    AsantiKeypad/res/values-zh-rTW/strings.xml
	deleted:    gps/Android.mk
	deleted:    gps/CleanSpec.mk
	deleted:    gps/NOTICE
	deleted:    gps/libloc_api_50001/Android.mk
	deleted:    gps/libloc_api_50001/LocApiAdapter.cpp
	deleted:    gps/libloc_api_50001/LocApiAdapter.h
	deleted:    gps/libloc_api_50001/gps.c
	deleted:    gps/libloc_api_50001/loc.cpp
	deleted:    gps/libloc_api_50001/loc.h
	deleted:    gps/libloc_api_50001/loc_eng.cpp
	deleted:    gps/libloc_api_50001/loc_eng.h
	deleted:    gps/libloc_api_50001/loc_eng_agps.cpp
	deleted:    gps/libloc_api_50001/loc_eng_agps.h
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn.cpp
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn.h
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_glue_msg.c
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_glue_msg.h
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_glue_pipe.h
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_handler.cpp
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_handler.h
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_thread_helper.c
	deleted:    gps/libloc_api_50001/loc_eng_dmn_conn_thread_helper.h
	deleted:    gps/libloc_api_50001/loc_eng_log.cpp
	deleted:    gps/libloc_api_50001/loc_eng_log.h
	deleted:    gps/libloc_api_50001/loc_eng_msg.cpp
	deleted:    gps/libloc_api_50001/loc_eng_msg.h
	deleted:    gps/libloc_api_50001/loc_eng_msg_id.h
	deleted:    gps/libloc_api_50001/loc_eng_ni.cpp
	deleted:    gps/libloc_api_50001/loc_eng_ni.h
	deleted:    gps/libloc_api_50001/loc_eng_xtra.cpp
	deleted:    gps/libloc_api_50001/loc_eng_xtra.h
	deleted:    gps/ulp/inc/ulp.h
	deleted:    gps/utils/Android.mk
	deleted:    gps/utils/linked_list.c
	deleted:    gps/utils/linked_list.h
	deleted:    gps/utils/loc_cfg.cpp
	deleted:    gps/utils/loc_cfg.h
	deleted:    gps/utils/loc_log.cpp
	deleted:    gps/utils/loc_log.h
	deleted:    gps/utils/log_util.h
	deleted:    gps/utils/msg_q.c
	deleted:    gps/utils/msg_q.h
	deleted:    include/hardware/gps.h
	deleted:    include/telephony/ril.h