Moxie Marlinspike f27c7c4178 Merge branch 'thoughtbox-patch-1' ...

Conflicts:
	res/values/strings.xml

2013-10-15 06:28:18 -07:00

..

arrays.xml

Added bulgarian and greek

2013-08-16 08:38:43 -07:00

attrs.xml

Basic support for composing emoji

2013-06-27 20:57:27 -07:00

colors.xml

Make the switch to gradle!

2013-10-10 13:52:24 -07:00

dimens.xml

display emoji correctly on devices of all densities

2013-07-15 17:33:30 -07:00

strings.xml

Merge branch 'thoughtbox-patch-1'

2013-10-15 06:28:18 -07:00

styles.xml

Make the switch to gradle!

2013-10-10 13:52:24 -07:00

themes.xml

Make the switch to gradle!

2013-10-10 13:52:24 -07:00