| commit | 67b39c228137123f33b99ff4dda014f68cf9c787 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 12:26:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 12:26:36 2015 +0000 |
| tree | 1b4eb72c1efbfaca9e9623c976040ecdd208fff5 | |
| parent | 1faeb11bad847a8cbe69e1b8fb4ab780d346a2f8 [diff] | |
| parent | ee1fa39520d6a7d5326f26b90140ebaf24ce7923 [diff] |
am ee1fa395: (-s ours) Import translations. DO NOT MERGE * commit 'ee1fa39520d6a7d5326f26b90140ebaf24ce7923': Import translations. DO NOT MERGE