diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-25 18:14:06 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2012-06-25 18:14:06 -0700 |
| commit | 9cc7ca29966903951b076867bcbc1fe6560fffe4 (patch) | |
| tree | b4b8ae56d7ca7b8fa8ca5ab6cd701bb23fa33cf5 /res/values-ar | |
| parent | d6fd8d5e5b2751a35b9014e39a3070b322c5d802 (diff) | |
| parent | 8f12b1287f1a61cc3a3ba0cab6790c2e8dce19a7 (diff) | |
| download | packages_apps_settings-9cc7ca29966903951b076867bcbc1fe6560fffe4.zip packages_apps_settings-9cc7ca29966903951b076867bcbc1fe6560fffe4.tar.gz packages_apps_settings-9cc7ca29966903951b076867bcbc1fe6560fffe4.tar.bz2 | |
resolved conflicts for merge of 8f12b128 to master
Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
Diffstat (limited to 'res/values-ar')
0 files changed, 0 insertions, 0 deletions