| commit | f697fb7c49871b3fa9af0c365b18fcb7c853e1e7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 21:36:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 21:36:15 2015 +0000 |
| tree | a4f601889b282b3e18a6d891920115c371702da6 | |
| parent | ffda870567504c4c47e50e7b132b6dced65ea160 [diff] | |
| parent | 179b5638cf35ba95b2939c7da7cdf1315941b153 [diff] |
am 179b5638: (-s ours) am c3019224: (-s ours) Import translations. DO NOT MERGE * commit '179b5638cf35ba95b2939c7da7cdf1315941b153': Import translations. DO NOT MERGE