| commit | e3e4bd7f32c30fa131fb84142a9c1cd05771750e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:38:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:38:52 2015 +0000 |
| tree | d2658caf61ec2cb001e7fd6ccb93297d9b4d563c | |
| parent | 56b7a690d1e4ca8bf50347b72f6dc2222d326db2 [diff] | |
| parent | 54158bc74debbe76637077cb354d910cfcf8ef01 [diff] |
am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE * commit '54158bc74debbe76637077cb354d910cfcf8ef01': Import translations. DO NOT MERGE