diff options
| author | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-06-11 20:05:11 -0700 |
|---|---|---|
| committer | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-06-11 20:05:11 -0700 |
| commit | 8b9bdf4f613b75f56385043b36b3314fe160d9c1 (patch) | |
| tree | 65cee77765cb658f7480b80307a98520a31e8008 /res/values-zh-rCN | |
| parent | 410c490c52b2313e00c9ab4eb5f9c0f67d1face3 (diff) | |
| parent | 9d8187cbdb82e36eae9a42eefda138b6d0925b1f (diff) | |
| download | android_packages_apps_Snap-8b9bdf4f613b75f56385043b36b3314fe160d9c1.tar.gz android_packages_apps_Snap-8b9bdf4f613b75f56385043b36b3314fe160d9c1.tar.bz2 android_packages_apps_Snap-8b9bdf4f613b75f56385043b36b3314fe160d9c1.zip | |
Merge tag 'android-4.4.3_r1' into HEAD
Android 4.4.3 release 1
* tag 'android-4.4.3_r1':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Remove TRIM support
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix samsung video recording
Fix WB indicator override
Revert fixed focus area in CAF mode
Add another HTC picture resolution
Always set focus mode first before applying scene mode
Reduce logging of flattened Preferences
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Conflicts:
res/values/arrays.xml
src/com/android/camera/FocusOverlayManager.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
Diffstat (limited to 'res/values-zh-rCN')
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f4913d312..9eb1820e3 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300万像素"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800万像素"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500万像素"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"400万像素"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400万像素 (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300万像素"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200万像素"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200万像素 (16:9)"</string> |