diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-19 11:12:14 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-19 11:12:14 -0800 |
| commit | f94068462649986dad263f28226be6c514af47d3 (patch) | |
| tree | 7f9622b0e83c4f4fd2ebd40134140d5f1aac44a2 /res/values-si-rLK | |
| parent | b347535cb09c5a7bebf0c928d9842236e43cd4b5 (diff) | |
| parent | a6194d3d9205488d6f5400193f8d4d6aaf140218 (diff) | |
| download | android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.tar.gz android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.tar.bz2 android_packages_apps_Trebuchet-f94068462649986dad263f28226be6c514af47d3.zip | |
resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary
Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277
Diffstat (limited to 'res/values-si-rLK')
0 files changed, 0 insertions, 0 deletions