diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-12 21:00:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-12 21:00:45 +0000 |
| commit | bddec52ad1fd1c2b9df259cbad6881247c0da8a7 (patch) | |
| tree | 334452a4b2b8045ccabc9225ed1afe94af5cf591 /res/values-en-rAU | |
| parent | 1d3bde1cb44484f58b5c9071026f2f5b35e218b7 (diff) | |
| parent | 76a3d918993a75e8c93554594c80b8c1a684ef7b (diff) | |
| download | android_packages_apps_Trebuchet-bddec52ad1fd1c2b9df259cbad6881247c0da8a7.tar.gz android_packages_apps_Trebuchet-bddec52ad1fd1c2b9df259cbad6881247c0da8a7.tar.bz2 android_packages_apps_Trebuchet-bddec52ad1fd1c2b9df259cbad6881247c0da8a7.zip | |
Merge "resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish" into ub-launcher3-dorval-polish
am: 76a3d91899
Change-Id: Ibe37f6e438000bb57b92ad232896be9530aaab49
Diffstat (limited to 'res/values-en-rAU')
0 files changed, 0 insertions, 0 deletions