| commit | 4f14cf9a779e4b15b9f745ceacc7d96f085b3a45 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 13:43:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 13:43:38 2015 +0000 |
| tree | d5475229f7c3b65fcb2bdf94b11004b6e433d678 | |
| parent | 94444882ed89789bc4b736a273dd9bc2fff3cc55 [diff] | |
| parent | 09f3e02a26accda11a86d062cfe7258db899f290 [diff] |
am 09f3e02a: (-s ours) am b3ccafd5: (-s ours) Import translations. DO NOT MERGE * commit '09f3e02a26accda11a86d062cfe7258db899f290': Import translations. DO NOT MERGE