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