| commit | 1c2260a107cd5ffa708e8addf2501014d86dc37e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:17:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:17:10 2015 +0000 |
| tree | 3f599a85076e3e23ae22547feb9025ddd40b4f54 | |
| parent | 5b45c3cb2fdd9299a3fa632047f3da1bec4e868a [diff] | |
| parent | c869c9597546c9e8f39bc71e0f98b10b341d9e73 [diff] |
am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE * commit 'c869c9597546c9e8f39bc71e0f98b10b341d9e73': Import translations. DO NOT MERGE