| commit | c26921538de45d63aa77594bbdd33c5d34b545e8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Mar 10 15:47:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 10 15:47:51 2015 +0000 |
| tree | 3265821c92f924e8871428a3c64e51b7a1f38bc4 | |
| parent | 2977c05fec4e91f9145074a9792c0dcb45b0782d [diff] | |
| parent | c90aa638f6465f383e40b2063d38496aab7b8914 [diff] |
am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE * commit 'c90aa638f6465f383e40b2063d38496aab7b8914': Import translations. DO NOT MERGE