diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-24 10:15:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 10:15:01 -0700 |
| commit | 95a09e516ecfd1b6b5481d71164cf9291b514c54 (patch) | |
| tree | 83e9e6f97177d8c0a079f6101c0a3e118fa16ecc /res/values-ca | |
| parent | befe710322675487b22937c319448a1790e201a1 (diff) | |
| parent | 6ba56c61966e32eb34d5b749c2774459f8e71f15 (diff) | |
| download | android_packages_apps_Trebuchet-95a09e516ecfd1b6b5481d71164cf9291b514c54.tar.gz android_packages_apps_Trebuchet-95a09e516ecfd1b6b5481d71164cf9291b514c54.tar.bz2 android_packages_apps_Trebuchet-95a09e516ecfd1b6b5481d71164cf9291b514c54.zip | |
am 6ba56c61: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6ba56c61966e32eb34d5b749c2774459f8e71f15':
Diffstat (limited to 'res/values-ca')
0 files changed, 0 insertions, 0 deletions