diff options
author | Wu-cheng Li <wuchengli@google.com> | 2009-11-05 01:22:20 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-05 01:22:20 -0800 |
commit | f733d7baa45f9dbe8cab0b47d11be2314d4a768a (patch) | |
tree | 30c521623feccfb6b78943f14156e398bd202347 /res/values | |
parent | ada28d6aed4403ea9ca8494f9fb2524681750d15 (diff) | |
parent | 7cbd151e21c98762976d9766ff700172604e04b2 (diff) | |
download | LegacyCamera-f733d7baa45f9dbe8cab0b47d11be2314d4a768a.zip LegacyCamera-f733d7baa45f9dbe8cab0b47d11be2314d4a768a.tar.gz LegacyCamera-f733d7baa45f9dbe8cab0b47d11be2314d4a768a.tar.bz2 |
am 7cbd151e: Merge change I834b0640 into eclair
Merge commit '7cbd151e21c98762976d9766ff700172604e04b2' into eclair-mr2
* commit '7cbd151e21c98762976d9766ff700172604e04b2':
Remove whiteboard and blackboard color effects.
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/arrays.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f95a1df..35e9d70 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -199,8 +199,6 @@ <item>@string/pref_camera_coloreffect_entry_negative</item> <item>@string/pref_camera_coloreffect_entry_solarize</item> <item>@string/pref_camera_coloreffect_entry_posterize</item> - <item>@string/pref_camera_coloreffect_entry_whiteboard</item> - <item>@string/pref_camera_coloreffect_entry_blackboard</item> <item>@string/pref_camera_coloreffect_entry_aqua</item> <item>@string/pref_camera_coloreffect_entry_pastel</item> <item>@string/pref_camera_coloreffect_entry_mosaic</item> @@ -216,8 +214,6 @@ <item>negative</item> <item>solarize</item> <item>posterize</item> - <item>whiteboard</item> - <item>blackboard</item> <item>aqua</item> <item>pastel</item> <item>mosaic</item> |