diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-10-19 18:01:45 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-10-19 18:01:45 +0200 |
| commit | 30648a835dfcf20f430abde5e29205fb437e3915 (patch) | |
| tree | d4d862d04994f48c9a79cbef1d93fc745af5b12e /res/values-fr | |
| parent | 75392614917aae2cd2414cf8ba5d2f81ca81a9be (diff) | |
| parent | 5c2a79361a937b076bfd33b52d6c3230cc295a3d (diff) | |
Merge pull request #555 from SamWhited/build-fixes
Fix problem when merging manifests during a Gradle build
Diffstat (limited to 'res/values-fr')
0 files changed, 0 insertions, 0 deletions