| commit | 7153e396243ade7169edc0063e4728708346a41c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 21 19:05:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 19:05:03 2015 +0000 |
| tree | 35f104f54ca3e66d39f73b35431689a87041b62f | |
| parent | 56022f34e47c1f4cffe8c7db6e927beeba76cf97 [diff] | |
| parent | e2e458d3befa348a6020d489e3ad87a7fcaedef5 [diff] |
am e2e458d3: (-s ours) am 0199a6bd: (-s ours) am ab5bdd77: (-s ours) Import translations. DO NOT MERGE * commit 'e2e458d3befa348a6020d489e3ad87a7fcaedef5': Import translations. DO NOT MERGE