| commit | 4df40a1d0151f68d2ab3e38aed74bbfd178819dd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 11 14:48:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 11 14:48:24 2015 +0000 |
| tree | fca15403f834b0a966b7ce01ea5412d6cccff757 | |
| parent | 4ba1ce5b93948a1ff9a728a115c8d365222883b4 [diff] | |
| parent | 5e0d52eb2fd877a18ba2a7c03a0a93edaaa15553 [diff] |
am 9250c933: (-s ours) am 189b0f90: (-s ours) Import translations. DO NOT MERGE * commit '9250c93359c18cc901fefe83ce3b933dec7cfaa6': Import translations. DO NOT MERGE