summaryrefslogtreecommitdiffstats
path: root/res/values-es
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2011-10-17 15:00:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-17 15:00:33 -0700
commit1920cca5077e15dbfedd85226d7b496d53276d75 (patch)
tree2a238ed6b8d079b9701569ee681dfc07110c39f7 /res/values-es
parent31bcb1d7a598d764718ef89b7298a27486f854ed (diff)
parentd943c5973495d0caa0f32662b98a8d9e82223092 (diff)
downloadLegacyCamera-1920cca5077e15dbfedd85226d7b496d53276d75.zip
LegacyCamera-1920cca5077e15dbfedd85226d7b496d53276d75.tar.gz
LegacyCamera-1920cca5077e15dbfedd85226d7b496d53276d75.tar.bz2
Merge "fix auto merge issues."
Diffstat (limited to 'res/values-es')
0 files changed, 0 insertions, 0 deletions