| commit | 45f672cb0f25c9840fec4c09a4bdba1d93986329 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:47:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:47:35 2015 +0000 |
| tree | d5138d7cc44a3569dbe193af5ca6757712689887 | |
| parent | 767be5452e458e95ed6944b1f48c56ead3430cee [diff] | |
| parent | 896ac8b5c9aecb39261f457adcf33415f9c94e77 [diff] |
am 633a69c3: (-s ours) am f9f18cb5: (-s ours) am 5330ed16: (-s ours) am 37029d3a: (-s ours) Import translations. DO NOT MERGE * commit '633a69c3078384a54467765369583600e2c61d20': Import translations. DO NOT MERGE