| commit | 475a4a0a00642433d552ef3273202804d1baeec5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:56:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:56:18 2015 +0000 |
| tree | 2e4fa29840402692105ad74f94c8d60793334a52 | |
| parent | 9e87bcea51de1c2a27a22ce7180290e27cf033c0 [diff] | |
| parent | 9fe7781171024a5046374d9c62d7c5affa049dc0 [diff] |
am 9fe77811: (-s ours) am 83c781e4: (-s ours) am 98c4eba2: (-s ours) Import translations. DO NOT MERGE * commit '9fe7781171024a5046374d9c62d7c5affa049dc0': Import translations. DO NOT MERGE