| commit | ce17cd28caee70b361a1b70c3ae5817714ab47ea | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 13:37:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 13:37:55 2015 +0000 |
| tree | 2c17ae160b39accbc6f7ab5f6d8562bd3982f87e | |
| parent | 5ed4e8b97e613ec4ae0dd3bdcff9bb043e5ea006 [diff] | |
| parent | 94491f6c44c9110bbf256c36a9dd9b1a4a426525 [diff] |
am 94491f6c: (-s ours) Import translations. DO NOT MERGE * commit '94491f6c44c9110bbf256c36a9dd9b1a4a426525': Import translations. DO NOT MERGE