anotherim/src/main/res
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
..
drawable Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
drawable-hdpi Make conversations the root project 2014-10-22 15:47:11 -04:00
drawable-mdpi Make conversations the root project 2014-10-22 15:47:11 -04:00
drawable-xhdpi Make conversations the root project 2014-10-22 15:47:11 -04:00
drawable-xxhdpi Make conversations the root project 2014-10-22 15:47:11 -04:00
layout Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
layout-w360dp Make conversations the root project 2014-10-22 15:47:11 -04:00
layout-w384dp Make conversations the root project 2014-10-22 15:47:11 -04:00
layout-w600dp Make conversations the root project 2014-10-22 15:47:11 -04:00
layout-w960dp Make conversations the root project 2014-10-22 15:47:11 -04:00
menu Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-ca Make conversations the root project 2014-10-22 15:47:11 -04:00
values-cs Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-de Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-es Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-eu Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
values-fr Make conversations the root project 2014-10-22 15:47:11 -04:00
values-gl Make conversations the root project 2014-10-22 15:47:11 -04:00
values-it Make conversations the root project 2014-10-22 15:47:11 -04:00
values-iw Make conversations the root project 2014-10-22 15:47:11 -04:00
values-nl Make conversations the root project 2014-10-22 15:47:11 -04:00
values-ru Make conversations the root project 2014-10-22 15:47:11 -04:00
values-sv Make conversations the root project 2014-10-22 15:47:11 -04:00
values-zh-rCN Make conversations the root project 2014-10-22 15:47:11 -04:00
values-zh-rTW Make conversations the root project 2014-10-22 15:47:11 -04:00
xml Make conversations the root project 2014-10-22 15:47:11 -04:00