| commit | 847d8e2d0d854c019e703809e9318371de3f46cf | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:25:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:25:52 2014 +0000 |
| tree | 31ef12a6bd9ef36e143d1c9f30877fae03d71c79 | |
| parent | bfca8281f590e2e7354709282f53846995662ea8 [diff] | |
| parent | b9925c43d7e8e38d21f9326217c10e4e67275f86 [diff] |
am b9925c43: (-s ours) am c4868dea: (-s ours) Import translations. DO NOT MERGE * commit 'b9925c43d7e8e38d21f9326217c10e4e67275f86': Import translations. DO NOT MERGE