| commit | 0cf9b88a41356b95aba7443a29cd6237877c5bc3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 21 22:23:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 21 22:23:22 2015 +0000 |
| tree | 7977d1fe2e81ccb5f8a9ef4491b6337570701aad | |
| parent | 11f18ac63e0dbe6818e6abac441c9a573ada4682 [diff] | |
| parent | f994332a622cadcc2e7d4e904a0c31e5e2086401 [diff] |
am f994332a: (-s ours) am 7e909abc: (-s ours) Import translations. DO NOT MERGE * commit 'f994332a622cadcc2e7d4e904a0c31e5e2086401': Import translations. DO NOT MERGE