diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-05-26 12:22:08 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-05-26 12:24:51 +0800 |
| commit | e005128299a7a690510fce8ad131537f0bb69250 (patch) | |
| tree | e5b3fd7e3b833428d7ba26ac8f864655cca4f2cb /res/values-es/strings.xml | |
| parent | f63363f2885f4c16546358a612aa4cc2b98430a4 (diff) | |
| parent | aae0cba54957cf0e6046d146aa018a4ed7a6f3b5 (diff) | |
| download | LegacyCamera-e005128299a7a690510fce8ad131537f0bb69250.zip LegacyCamera-e005128299a7a690510fce8ad131537f0bb69250.tar.gz LegacyCamera-e005128299a7a690510fce8ad131537f0bb69250.tar.bz2 | |
resolved conflicts for merge of aae0cba5 to master
Change-Id: I681c7f38abaed6705640c4e79e06a581990ec496
Diffstat (limited to 'res/values-es/strings.xml')
0 files changed, 0 insertions, 0 deletions