| commit | e8fe295079fe5448a8b6086c3bfb80043b9e3ac0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:42:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:42:54 2015 +0000 |
| tree | d72c801f7505a93d8460127a45d331010578978d | |
| parent | 8593040cdeeeeddf3dcd2744d840255902894509 [diff] | |
| parent | 944ee8a700b5a2786b1eec9466fa0c12f5f540a8 [diff] |
am 944ee8a7: (-s ours) am f5766c04: (-s ours) Import translations. DO NOT MERGE * commit '944ee8a700b5a2786b1eec9466fa0c12f5f540a8': Import translations. DO NOT MERGE