| commit | 80d812b9b5cac86d74d8de6d72c83462c78087ba | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 22 20:48:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 20:48:22 2014 +0000 |
| tree | 56a6e211764dea32417019f2e50bd923a9661b59 | |
| parent | 4bfba71f8b462e3f67eee61f47f8ec02388847f2 [diff] | |
| parent | c9e4f942276506c25922e0d61a3978cc2b1c9bc6 [diff] |
am c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'c9e4f942276506c25922e0d61a3978cc2b1c9bc6': Import translations. DO NOT MERGE