| commit | b6a5dab3ed29c9c9bc864abff0e534641dcd4f32 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 14:36:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 14:36:56 2014 +0000 |
| tree | 977e500f236434d89c9a48df9521127f4391b134 | |
| parent | fa205ffff292bcbc1c504491b7ca2a5ee1b7b547 [diff] | |
| parent | feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21 [diff] |
am feb6c7f3: (-s ours) Import translations. DO NOT MERGE * commit 'feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21': Import translations. DO NOT MERGE