| commit | 09c163c3dcc4971be645daed0e9345575ea0e34d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 08 18:32:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 08 18:32:22 2014 +0000 |
| tree | 0f44ac3af2bb707cf22f32a1095f67bd028778b8 | |
| parent | 5954dbde3b8a3d2716b04c067505180b47d0b2ab [diff] | |
| parent | 6482273e836a7a6de5f8d05562ddc1afc2bfa828 [diff] |
am 6482273e: (-s ours) am 4ebb0071: (-s ours) Import translations. DO NOT MERGE * commit '6482273e836a7a6de5f8d05562ddc1afc2bfa828': Import translations. DO NOT MERGE