| commit | 498af6a5693cde49419f3a9abcfeb572d3a461e2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 21:19:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 21:19:22 2015 +0000 |
| tree | 5d1ef8988582eff274989959c736d5b29dadc77a | |
| parent | 4e3575eb98e1b60600a9146862ab190491eec035 [diff] | |
| parent | ca7f4ce983d0bf25433226eb35f052741339ef12 [diff] |
am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE * commit 'ca7f4ce983d0bf25433226eb35f052741339ef12': Import translations. DO NOT MERGE