| commit | 7aa93c2da61e40cf69278477ecc042a2b37d6e41 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:43:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:43:07 2014 +0000 |
| tree | aa28c3d5fe0b52253edff4b1fbe1e175b39b56f7 | |
| parent | 7a0e53ed12c0a9849ff9db78337ac075cc57d2e3 [diff] | |
| parent | e00dcd6b0db052b2ca7c3b34636c046b6e1a416e [diff] |
am e00dcd6b: (-s ours) am 5735b549: (-s ours) am 910fcbff: (-s ours) Import translations. DO NOT MERGE * commit 'e00dcd6b0db052b2ca7c3b34636c046b6e1a416e': Import translations. DO NOT MERGE