| commit | 69fb577db85d7924c89f1ab73835dcee3af697bd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:40 2015 +0000 |
| tree | d341b852a90648f8b06a7b2ae065c1be18dea800 | |
| parent | 46ae3b960d1c34bd5fb84a656ff4b57fe259715c [diff] | |
| parent | 955fca8d9d326752c37b186e58cc7523501f01ba [diff] |
am 955fca8d: (-s ours) am 66fdcfe4: (-s ours) Import translations. DO NOT MERGE * commit '955fca8d9d326752c37b186e58cc7523501f01ba': Import translations. DO NOT MERGE