comparison res/values/strings.xml @ 165:924523c03ca7

merge
author Carl Byington <carl@five-ten-sg.com>
date Tue, 24 Jun 2014 12:39:43 -0700
parents eff82d6c11d9
children f0b9ea35711a
comparison
equal deleted inserted replaced
163:284152c31335 165:924523c03ca7