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