diff options
| author | Tony <tonyswickham@gmail.com> | 2016-09-23 19:42:53 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2016-09-23 19:43:35 -0700 |
| commit | 5eea1e89dd7e100851d97968855b2868d01e7faa (patch) | |
| tree | 479d9a4679474d812357bc35ffbb1e64f9a8190b /res/values-pt-rPT | |
| parent | 20eedeb5ae4cddb3d9de0701e80509f07a9fe3b9 (diff) | |
| parent | 6e74e899d314663415f54895227bb79a51fd734b (diff) | |
| download | android_packages_apps_Trebuchet-5eea1e89dd7e100851d97968855b2868d01e7faa.tar.gz android_packages_apps_Trebuchet-5eea1e89dd7e100851d97968855b2868d01e7faa.tar.bz2 android_packages_apps_Trebuchet-5eea1e89dd7e100851d97968855b2868d01e7faa.zip | |
resolve merge conflicts of 6e74e89 to ub-launcher3-master
Change-Id: I34e449ca3a91ee06e1983ac3a83cb7ca53567a91
Diffstat (limited to 'res/values-pt-rPT')
0 files changed, 0 insertions, 0 deletions