| commit | 2926f809bc3d7b362513513ffc0c4525fab2d3e0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:19 2015 +0000 |
| tree | cee3dfbd0a2df6ca7e9a8559c1a24d2b1bb4339a | |
| parent | a0fc46ebd329a0714c91e9ea7ace7bbd5aa34a4d [diff] | |
| parent | 9b398e7aa7c041b04cda50f2dcc0fcc222c23a86 [diff] |
am 9b398e7a: (-s ours) am f42638f5: (-s ours) Import translations. DO NOT MERGE * commit '9b398e7aa7c041b04cda50f2dcc0fcc222c23a86': Import translations. DO NOT MERGE