Philipp Schaefer ab164cfde5 Merge branch 'intents' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-intents ...

Conflicts:
	mobile/res/values/strings.xml

2013-07-27 11:23:51 +02:00

..

action_about.png

…

action_search.png

…

action_settings.png

…

alerts_and_states_warning.png

…

av_full_screen.png

…

browser.png

…

content_remove.png

…

copy.png

…

device_access_location_found.png

…

ic_iitcm.png

…

ic_layer_chooser.png

…

iitc.png

…

location_map.png

…

navigation_refresh.png

…

share.png

…

social_group.png

…