diff options
| author | Winson <winsonc@google.com> | 2015-10-16 16:47:49 -0700 |
|---|---|---|
| committer | Winson <winsonc@google.com> | 2015-10-16 16:47:49 -0700 |
| commit | 47ecbb85f3ef64669b5a56ac749afc500043e24b (patch) | |
| tree | 2a00f5ea78c2cf494d93d45e72211cacacffde83 /res/values-zh-rTW | |
| parent | 8385e7188d66f632ac471ce3750bae3c199740bc (diff) | |
| parent | fb4014daa38977ba7cb35f32edfe1307f3ab4243 (diff) | |
| download | android_packages_apps_Trebuchet-47ecbb85f3ef64669b5a56ac749afc500043e24b.tar.gz android_packages_apps_Trebuchet-47ecbb85f3ef64669b5a56ac749afc500043e24b.tar.bz2 android_packages_apps_Trebuchet-47ecbb85f3ef64669b5a56ac749afc500043e24b.zip | |
resolve merge conflicts of fb4014daa3 to ub-launcher3-master.
Change-Id: I6d84a7f3fad757bf139b6ea0001ac6ab88850996
Diffstat (limited to 'res/values-zh-rTW')
0 files changed, 0 insertions, 0 deletions