diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-15 13:37:35 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-15 13:37:35 +0100 |
| commit | deb0a156bb20e8bdc2ceba433dfae5adb019f321 (patch) | |
| tree | 5efc079fb5e65b99fd5c97e89cb9eca303baafe3 /res/values-et-rEE | |
| parent | 9e9d6cd33ffcb223d14f4af04b90ae6a5709a137 (diff) | |
| parent | 67e72aa49e39a488b5fdc8972e21fb4ebe79e161 (diff) | |
| download | packages_apps_Settings-deb0a156bb20e8bdc2ceba433dfae5adb019f321.tar.gz packages_apps_Settings-deb0a156bb20e8bdc2ceba433dfae5adb019f321.tar.bz2 packages_apps_Settings-deb0a156bb20e8bdc2ceba433dfae5adb019f321.zip | |
Resolved conflicts for merge of 67e72aa4 to master
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
Diffstat (limited to 'res/values-et-rEE')
0 files changed, 0 insertions, 0 deletions