| commit | 012fc886643060d848ef895ac0e4bf347cba8428 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 21:30:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 21:30:57 2015 +0000 |
| tree | 320b4b7a4af98d977f0fcaab0b2a53e1efdf6d48 | |
| parent | f8f1eacd2124e679b556f1c7f11b4a65db7bccfc [diff] | |
| parent | 7262945e4f9775f74621d0a042a080a5607553fa [diff] |
am 7262945e: (-s ours) am 0816a36d: (-s ours) Import translations. DO NOT MERGE * commit '7262945e4f9775f74621d0a042a080a5607553fa': Import translations. DO NOT MERGE