summaryrefslogtreecommitdiffstats
path: root/res/values-fr
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2014-04-30 12:50:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 12:50:28 +0000
commit731f9f5f37cd51004b7f50de53b38d08b77b4084 (patch)
tree149be6e4c25e7b46573bc62077be26711305c9fb /res/values-fr
parent3252d1cd3affeaceef1d69e605708b1cd44a2d5f (diff)
parentc88835851d57fda27608822ed2cd4ffdb87292fb (diff)
downloadpackages_apps_Settings-731f9f5f37cd51004b7f50de53b38d08b77b4084.zip
packages_apps_Settings-731f9f5f37cd51004b7f50de53b38d08b77b4084.tar.gz
packages_apps_Settings-731f9f5f37cd51004b7f50de53b38d08b77b4084.tar.bz2
am c8883585: am a3860afc: Merge commit \'36a1bbe89025341987df0e380982cfbb4d09fe30\' into HEAD
* commit 'c88835851d57fda27608822ed2cd4ffdb87292fb':
Diffstat (limited to 'res/values-fr')
0 files changed, 0 insertions, 0 deletions