| commit | c14b17822d7c1a183de0e30307abcf86350a80cc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:45:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:45:01 2015 +0000 |
| tree | 718b77aeeafad02c7a85b4fb1e6b4509a61f809b | |
| parent | f522848259047de88f6d43340ca62e2d09307f06 [diff] | |
| parent | 1ddf059e6d5a601e12d75e1cf2913ef24cac2bb8 [diff] |
am 1ddf059e: (-s ours) am 069bf3c2: (-s ours) am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE * commit '1ddf059e6d5a601e12d75e1cf2913ef24cac2bb8': Import translations. DO NOT MERGE