diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-12 13:29:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-12 13:29:07 -0700 |
| commit | 019915a1cc017113d37ad378f00141cff68d853a (patch) | |
| tree | d2589f124c60b5707f4a08a6f77d222a7a8422f8 /res/values-fr | |
| parent | 7eafc6d4264923bba042a0db607ec066058d5fbd (diff) | |
| parent | aafb404d330f7b9a4617154b6a7c287a305858b5 (diff) | |
| download | android_packages_apps_Calendar-019915a1cc017113d37ad378f00141cff68d853a.tar.gz android_packages_apps_Calendar-019915a1cc017113d37ad378f00141cff68d853a.tar.bz2 android_packages_apps_Calendar-019915a1cc017113d37ad378f00141cff68d853a.zip | |
Merge "resolved conflicts for merge of 80401e59 to master"
Diffstat (limited to 'res/values-fr')
0 files changed, 0 insertions, 0 deletions