Anthony Restaino 6a7b4bfe68 Manual merge of Settings changes from @pejakm due to merge conflicts		2014-12-31 12:56:33 -05:00
..
strings.xml	Manual merge of Settings changes from @pejakm due to merge conflicts	2014-12-31 12:56:33 -05:00