summaryrefslogtreecommitdiffstats
path: root/res/values-fa/strings.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-09-12 16:59:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-12 16:59:13 -0700
commit92f55b92f30edae3bbd91cb66bd0dfdf5fc6580a (patch)
tree42c48878e9b35c1c4e413d67e0866d6f50ba2674 /res/values-fa/strings.xml
parent13a185d85c01f9ab6cab978a22cd69965f2eea1d (diff)
parent292694aa0171ec032e9abb08f09b82319e27044d (diff)
downloadandroid_packages_apps_Trebuchet-92f55b92f30edae3bbd91cb66bd0dfdf5fc6580a.tar.gz
android_packages_apps_Trebuchet-92f55b92f30edae3bbd91cb66bd0dfdf5fc6580a.tar.bz2
android_packages_apps_Trebuchet-92f55b92f30edae3bbd91cb66bd0dfdf5fc6580a.zip
am 292694aa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '292694aa0171ec032e9abb08f09b82319e27044d': Workaround for generating QSB icon press states. (Bug 7132477) Adding more debug code for dup. ItemInfo bug
Diffstat (limited to 'res/values-fa/strings.xml')
0 files changed, 0 insertions, 0 deletions