| commit | f96891537685d96709013da4d4ab1e51d9b96a1e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:04:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:04:14 2015 +0000 |
| tree | 54650e0e7fe52ca077756e08f3d1930934cff7e0 | |
| parent | 3a739e8881073221cf6017a0b6a2c35f91fa4e85 [diff] | |
| parent | 1369b078b268636422a69989729c234e16939094 [diff] |
am 1369b078: (-s ours) am ce17cd28: (-s ours) am 94491f6c: (-s ours) Import translations. DO NOT MERGE * commit '1369b078b268636422a69989729c234e16939094': Import translations. DO NOT MERGE