diff options
| author | Geoff Mendal <mendal@google.com> | 2014-08-05 13:31:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-05 13:31:21 +0000 |
| commit | 57faaab7f5deaf3ba87e5d493acb0d744a804f68 (patch) | |
| tree | fd562a87480ee4c0c7632595a772ad4e64279315 /res | |
| parent | e833a7f70aee20a2c87b285fc7419305dfb53b02 (diff) | |
| parent | 0f42fe23abd20663cc1e0ea4cfce8b4f6ed09c13 (diff) | |
am 0f42fe23: (-s ours) am c8e35f48: (-s ours) am 7c366c7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '0f42fe23abd20663cc1e0ea4cfce8b4f6ed09c13':
Import translations. DO NOT MERGE
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions