| commit | 4ba01226dfd880fa47a0ca6ca39d1c521d38f11f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 18:13:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 18:13:41 2015 +0000 |
| tree | 0853f2740c83af2763e0eceb94e72ae681680d46 | |
| parent | 723665d5bd319a8b911dc69c78a7a20a39ee539a [diff] | |
| parent | 4e4aa06bf7c52a69b59dbdf8ca6cb47b8618931e [diff] |
am 4e4aa06b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4e4aa06bf7c52a69b59dbdf8ca6cb47b8618931e': Import translations. DO NOT MERGE