diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-10-09 07:35:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 07:35:41 -0700 |
| commit | 525568f46312d325ad07cab9ef9509f37168062a (patch) | |
| tree | ce1eb6a0ff628d16623186b92e99ecc48e752a20 /res/values-fr | |
| parent | 8c063cfcff569e7d68b7405c5b25caba8ce02549 (diff) | |
| parent | 7bd31959b18aa609a2272dfb3e6678f43a90a661 (diff) | |
| download | android_packages_apps_Trebuchet-525568f46312d325ad07cab9ef9509f37168062a.tar.gz android_packages_apps_Trebuchet-525568f46312d325ad07cab9ef9509f37168062a.tar.bz2 android_packages_apps_Trebuchet-525568f46312d325ad07cab9ef9509f37168062a.zip | |
am 7bd31959: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '7bd31959b18aa609a2272dfb3e6678f43a90a661':
Diffstat (limited to 'res/values-fr')
0 files changed, 0 insertions, 0 deletions