| commit | fa730043fd3503bb1cbfb4e95ef58e86d8f5c0ef | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:57:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:57:42 2015 +0000 |
| tree | ead1135076a288d7eeb8d78f352b175ece0fab74 | |
| parent | dbb9d2c7c8ba3e9c51a7222788b07186a273ccab [diff] | |
| parent | 26c551aaa615a2af3ee8db240fc6f7d65c5532d6 [diff] |
am 26c551aa: (-s ours) am 32771d68: (-s ours) am 751b01e3: (-s ours) Import translations. DO NOT MERGE * commit '26c551aaa615a2af3ee8db240fc6f7d65c5532d6': Import translations. DO NOT MERGE