| commit | 7c69964c33ed0c8280dbfef34cbe025cff65efbc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:00:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:00:27 2015 +0000 |
| tree | 29ce4d6c8f8904f4301e6c91563d0892627ad0ec | |
| parent | ef5db63988d83fbad4ef0d5ad7218b98971252a0 [diff] | |
| parent | 9635e64eb5884b44349b384466afbbd118309ae3 [diff] |
am 9635e64e: (-s ours) Import translations. DO NOT MERGE * commit '9635e64eb5884b44349b384466afbbd118309ae3': Import translations. DO NOT MERGE