| commit | 870ba02933fa364660384944fa13ac0a94cab1b5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 06 04:24:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 04:24:30 2015 +0000 |
| tree | f36038f59c76d5a625aa80658415c77a2c01a140 | |
| parent | 854533a82d5cfeac27e80b610544291c5be4fa39 [diff] | |
| parent | 40f6e9ab3ea41203d0ba1737713db58751e1995d [diff] |
am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE * commit '40f6e9ab3ea41203d0ba1737713db58751e1995d': Import translations. DO NOT MERGE