diff options
| author | Tony Wickham <twickham@google.com> | 2015-10-09 10:05:56 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-10-09 10:05:56 -0700 |
| commit | a72f49cfc466c5b57032405cb0e42e7140764323 (patch) | |
| tree | a3003c614a4ebcce1549ce9a3fb800dc6d3d10ad /res/values-zh-rCN | |
| parent | 72c689a7a27d0bddf804fdfd1eb69c9bc1a901f7 (diff) | |
| parent | fa3c369cc30345e23b2b90415a3348490dd2a0b2 (diff) | |
| download | android_packages_apps_Trebuchet-a72f49cfc466c5b57032405cb0e42e7140764323.tar.gz android_packages_apps_Trebuchet-a72f49cfc466c5b57032405cb0e42e7140764323.tar.bz2 android_packages_apps_Trebuchet-a72f49cfc466c5b57032405cb0e42e7140764323.zip | |
resolved conflicts for fa3c369c to ub-launcher3-master
Change-Id: I6bfc3d3b731a414060d86d4f1dfc5480c279edc9
Diffstat (limited to 'res/values-zh-rCN')
0 files changed, 0 insertions, 0 deletions