| commit | 50911cd2e85dadff33a4599c1f9c3309ff7b456c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 06:39:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:39:39 2015 +0000 |
| tree | d93fc194489328153d8a53975d94ed4df10e6351 | |
| parent | efedcc7ca1560e780da7d601e597bc4bf9d1e3e2 [diff] | |
| parent | f246829990173b23aa3743b78e2a1cf64d209f0d [diff] |
am f2468299: (-s ours) am 5c26ba7d: (-s ours) Import translations. DO NOT MERGE * commit 'f246829990173b23aa3743b78e2a1cf64d209f0d': Import translations. DO NOT MERGE