| commit | d9617fe5b80f94a30efa7b38ec033bbad2023dfb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 14:15:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 14:15:56 2015 +0000 |
| tree | 3c716ac0224738f1f014f8117cca6656121dda39 | |
| parent | be0a85535568e3b9b4ad66d82229669e9f4307c0 [diff] | |
| parent | 434770d5851f5fdc67c040e56e654f4f114693dc [diff] |
am 434770d5: (-s ours) am 5f5c4b23: (-s ours) am ea49b2f6: (-s ours) Import translations. DO NOT MERGE * commit '434770d5851f5fdc67c040e56e654f4f114693dc': Import translations. DO NOT MERGE