diff options
author | Wei Huang <weih@google.com> | 2011-10-17 15:00:33 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-17 15:00:33 -0700 |
commit | 1920cca5077e15dbfedd85226d7b496d53276d75 (patch) | |
tree | 2a238ed6b8d079b9701569ee681dfc07110c39f7 /res/values-es | |
parent | 31bcb1d7a598d764718ef89b7298a27486f854ed (diff) | |
parent | d943c5973495d0caa0f32662b98a8d9e82223092 (diff) | |
download | LegacyCamera-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