diff options
| author | Steve Howard <showard@google.com> | 2010-09-16 14:29:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 14:29:14 -0700 |
| commit | 21b7855b2a6411bacbe27a91527fa2d68d14b8fa (patch) | |
| tree | 03f00aaa28acdc20942daf663e7722e2eac28ca9 /res/values-fr | |
| parent | c3af51eb54a4acfa7e94dff65f469de54f572834 (diff) | |
| parent | 176a74426f750dc56e7d200a4cdc3b6ed75fe6cd (diff) | |
| download | android_packages_providers_DownloadProvider-21b7855b2a6411bacbe27a91527fa2d68d14b8fa.tar.gz android_packages_providers_DownloadProvider-21b7855b2a6411bacbe27a91527fa2d68d14b8fa.tar.bz2 android_packages_providers_DownloadProvider-21b7855b2a6411bacbe27a91527fa2d68d14b8fa.zip | |
am 176a7442: resolved conflicts for merge of 3d55d829 to gingerbread-plus-aosp
Merge commit '176a74426f750dc56e7d200a4cdc3b6ed75fe6cd'
* commit '176a74426f750dc56e7d200a4cdc3b6ed75fe6cd':
New URI structure with "my_downloads" and "all_downloads"
Diffstat (limited to 'res/values-fr')
0 files changed, 0 insertions, 0 deletions