| commit | 634b17063b79167ae0c0459afa7b528d933c4011 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 07 14:34:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 14:34:03 2015 +0000 |
| tree | 275d75b1ed6c5feea7c86924af3b520e3ef6ba17 | |
| parent | 620a5bd077c7077058f460af5025ad7d2cd94758 [diff] | |
| parent | 0347196c6992e490be74c2a4015bc6cd64504f15 [diff] |
am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE * commit '0347196c6992e490be74c2a4015bc6cd64504f15': Import translations. DO NOT MERGE