| commit | d7e9aee5288f14f5fe35440c05e716594cd3bc9b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 30 16:59:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 16:59:15 2014 +0000 |
| tree | 868fbc4401dbf7b02394e79474a5fcaba838e728 | |
| parent | 967785c55071e726bc4a8ed002b1ad03258317f0 [diff] | |
| parent | b80ea9815a7942f1aae9bb242d765d44b7e5531e [diff] |
am 6c94eab2: (-s ours) Import translations. DO NOT MERGE * commit '6c94eab26670f86aec842e89052586c725a5a802': Import translations. DO NOT MERGE