Vavassor 63bf832ffd resolves merge conflict		2017-07-06 22:15:44 -04:00
..
attrs.xml	…
colors.xml	…
dimens.xml	…
donottranslate.xml	…
strings.xml	resolves merge conflict	2017-07-06 22:15:44 -04:00
styles.xml	…