summaryrefslogtreecommitdiffstats
path: root/res/values-fa
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-02 05:59:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 05:59:24 -0700
commit32655b2c1f3bd587ad6d8e8b5948f0d6facc06bf (patch)
treec737f9dc5d68c6800d73166d7bfbf0cd039fada9 /res/values-fa
parent7c2e289461b3108a37c1a2aa04f833763461b21a (diff)
parent20df4f87ec69e34f62bf15c7e3078db479fbfdd7 (diff)
downloadandroid_packages_apps_Trebuchet-32655b2c1f3bd587ad6d8e8b5948f0d6facc06bf.tar.gz
android_packages_apps_Trebuchet-32655b2c1f3bd587ad6d8e8b5948f0d6facc06bf.tar.bz2
android_packages_apps_Trebuchet-32655b2c1f3bd587ad6d8e8b5948f0d6facc06bf.zip
am 20df4f87: Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose
* commit '20df4f87ec69e34f62bf15c7e3078db479fbfdd7': Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)
Diffstat (limited to 'res/values-fa')
0 files changed, 0 insertions, 0 deletions