diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
| commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
| tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /res/values-en-rGB | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
| download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip | |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'res/values-en-rGB')
0 files changed, 0 insertions, 0 deletions