| commit | f58f6c6e430041400c50419ebefd4b676417b74d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 08 16:42:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 16:42:59 2015 +0000 |
| tree | dd8749f59e61414263b8867cea68801ee7c45185 | |
| parent | 9f5f329c83160fc317349cf9ac65a5817aa2f0e5 [diff] | |
| parent | 06202b5c1c9d0c658c298646e95185e7763143b0 [diff] |
am 06202b5c: (-s ours) Import translations. DO NOT MERGE * commit '06202b5c1c9d0c658c298646e95185e7763143b0': Import translations. DO NOT MERGE