| commit | 4c54180dc708780d8eb99e97b0f9f78b11de7242 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 16 14:33:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 16 14:33:12 2015 +0000 |
| tree | 8f1250bbea56785280e627e1ab1154896d27c389 | |
| parent | 576a39710071bebb5a9c10e30a83246154e9e11d [diff] | |
| parent | 5198624c2a4db659f0fea36ad6cbb66dc734d1e9 [diff] |
am 5198624c: (-s ours) am ae87c907: (-s ours) Import translations. DO NOT MERGE * commit '5198624c2a4db659f0fea36ad6cbb66dc734d1e9':