| commit | 3db74bcac2d39b9c085eec8e5f1dc35715697c0a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 24 14:06:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 24 14:06:02 2015 +0000 |
| tree | 62ccc21defde2d0b29125751b1e622e9ea335bfe | |
| parent | 264f86a16e364e222de3b9c18b23d5cfc6f60bc6 [diff] | |
| parent | 599666a113945d098df9e72fdd0519a2edb8ef07 [diff] |
am 599666a1: (-s ours) am 469471d2: (-s ours) Import translations. DO NOT MERGE * commit '599666a113945d098df9e72fdd0519a2edb8ef07': Import translations. DO NOT MERGE