commit | 79f7d3358797704d1b499801571a7b88652e11db | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Dec 09 23:19:44 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:19:44 2014 +0000 |
tree | 366bd7b1fc7cd90dd02b59efcd3a11ceb65f6f30 | |
parent | 967e2bd758b1794f09a02182dc5b9c566e3c47c1 [diff] | |
parent | ce4fbd8f234f926ca271715726f91fd6ab912f23 [diff] |
am ce4fbd8f: (-s ours) am b1294d12: (-s ours) Import translations. DO NOT MERGE * commit 'ce4fbd8f234f926ca271715726f91fd6ab912f23': Import translations. DO NOT MERGE