| commit | 5a761be3dd72b5a318f9387d104f7010b327bfec | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 12:37:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 12:37:43 2015 +0000 |
| tree | da373ba84a76391ee202dea14f7ebbd5d0e5ee3e | |
| parent | 90de3bebf432d0897607adaca281fe248cd6575f [diff] | |
| parent | 7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0 [diff] |
am 7d521a8f: (-s ours) am f598d0bc: (-s ours) Import translations. DO NOT MERGE * commit '7d521a8ff28ac8bc6110bc6eaff38c58bb792ca0': Import translations. DO NOT MERGE