| commit | 64ebfeb7bf1e16acae661cf85136468077625e16 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 17:26:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:26:16 2015 +0000 |
| tree | 0d223707273f3e87db0069f85c99d2305bff3782 | |
| parent | d8b1f6da0fb335a648de52070441e96f6569303c [diff] | |
| parent | c0c6e29aac0317499c660dd3291025e94edf056f [diff] |
am c0c6e29a: (-s ours) am 439c0b5f: (-s ours) am 581eb262: (-s ours) Import translations. DO NOT MERGE * commit 'c0c6e29aac0317499c660dd3291025e94edf056f': Import translations. DO NOT MERGE