| commit | bf83b39739d4d0a991d287b7d0d23eb670333aa8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 14:47:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 14:47:34 2015 +0000 |
| tree | 15d05cc8baacd8d571c05f2ea4e6811f16ce14fd | |
| parent | 7cd90763d136dd6d72107f5ec8ca3baa04980dba [diff] | |
| parent | d52aa500412c248946bb8fa3cc4f3f20f5c34e3b [diff] |
am d52aa500: (-s ours) am 5111d83b: (-s ours) am f5016cd7: (-s ours) Import translations. DO NOT MERGE * commit 'd52aa500412c248946bb8fa3cc4f3f20f5c34e3b': Import translations. DO NOT MERGE