diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-25 10:29:29 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-05-25 10:34:10 +0800 |
| commit | 8dd4072f86ccf17152b2da9f7bb0696aec268809 (patch) | |
| tree | 7ae540799d28997c4b1f1a69cf70310d21bc8fd4 /res/values-es/strings.xml | |
| parent | a31cbd3aae70135633661b4f159009b907672baf (diff) | |
| parent | e293317fd0e3726c1d6d7ce743995c6f911b6cd5 (diff) | |
| download | LegacyCamera-8dd4072f86ccf17152b2da9f7bb0696aec268809.zip LegacyCamera-8dd4072f86ccf17152b2da9f7bb0696aec268809.tar.gz LegacyCamera-8dd4072f86ccf17152b2da9f7bb0696aec268809.tar.bz2 | |
resolved conflicts for merge of e293317f to master
Change-Id: I395d7d596414d118ebb788ef5a46e052785935a7
Diffstat (limited to 'res/values-es/strings.xml')
0 files changed, 0 insertions, 0 deletions