summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-11-03 03:43:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-03 03:43:54 -0800
commit96aefdd25c72b2ec644efdeef9b3da0714a61aa1 (patch)
tree62f1d0c1eec02b1e0bab37e9da9d4eff3575f60f
parentb5b1901e83564a032545bb6a3d1c521b48c15dfb (diff)
parent6e4a7d90f4a6728e9db7173e221aa504d13828ec (diff)
downloadLegacyCamera-96aefdd25c72b2ec644efdeef9b3da0714a61aa1.zip
LegacyCamera-96aefdd25c72b2ec644efdeef9b3da0714a61aa1.tar.gz
LegacyCamera-96aefdd25c72b2ec644efdeef9b3da0714a61aa1.tar.bz2
am 6e4a7d90: Change white-balance string "cloudy" to "cloudy-daylight".
Merge commit '6e4a7d90f4a6728e9db7173e221aa504d13828ec' into eclair-mr2 * commit '6e4a7d90f4a6728e9db7173e221aa504d13828ec': Change white-balance string "cloudy" to "cloudy-daylight".
-rw-r--r--res/values/arrays.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 026ed71..f95a1df 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -172,7 +172,7 @@
<item>incandescent</item>
<item>daylight</item>
<item>fluorescent</item>
- <item>cloudy</item>
+ <item>cloudy-daylight</item>
</string-array>
<array name="pref_camera_whitebalance_icons">