summaryrefslogtreecommitdiffstats
path: root/res/values-fa/strings.xml
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2012-04-30 13:01:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-30 13:01:00 -0700
commitc943e163b91891f3b2b79bc1bae34af10ec3cf54 (patch)
tree65b3faf4b806c329ab8cc63b06ccf453beebbfeb /res/values-fa/strings.xml
parent1da7a40528ba066bf69b9b846d8f0544ca7fa25a (diff)
parent50213b692c09a0121d066d8e1101ec253898e934 (diff)
downloadandroid_packages_apps_Gallery2-c943e163b91891f3b2b79bc1bae34af10ec3cf54.tar.gz
android_packages_apps_Gallery2-c943e163b91891f3b2b79bc1bae34af10ec3cf54.tar.bz2
android_packages_apps_Gallery2-c943e163b91891f3b2b79bc1bae34af10ec3cf54.zip
am 50213b69: Merge "Don\'t enter film mode automatically when moving from camera preview to picture." into jb-dev
* commit '50213b692c09a0121d066d8e1101ec253898e934': Don't enter film mode automatically when moving from camera preview to picture.
Diffstat (limited to 'res/values-fa/strings.xml')
0 files changed, 0 insertions, 0 deletions