anotherim/src/main/res/drawable
Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
..
actionbar_tab_indicator.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
es_slidingpane_shadow.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
grey.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
greybackground.xml Make conversations the root project 2014-10-22 15:47:11 -04:00
infocard_border.xml Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
message_border.xml Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
snackbar.xml Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00