| commit | d2a8c1d819565d7f2df2000824b31276bd6ad1f7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 16:47:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 16:47:55 2015 +0000 |
| tree | 0f7580e179920cbbcac9d19b98ecc9e6b7ecae75 | |
| parent | c252656475260ca9dae008c9e7904ccf023db49c [diff] | |
| parent | ffdc18a9daffa1077c4a044fca7156704cb6f55f [diff] |
am ffdc18a9: (-s ours) am 2808bb0a: (-s ours) Import translations. DO NOT MERGE * commit 'ffdc18a9daffa1077c4a044fca7156704cb6f55f': Import translations. DO NOT MERGE