| commit | 403bd62c01375910bddb89c7c8dd09ef3fca0ee7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:09:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:09:39 2015 +0000 |
| tree | fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5 | |
| parent | de0672f07f24260837cbc3e2690bfa3fbd92ba3d [diff] | |
| parent | 839c662747058d2b1ca765b9daf6c73686468888 [diff] |
am 839c6627: (-s ours) Import translations. DO NOT MERGE * commit '839c662747058d2b1ca765b9daf6c73686468888': Import translations. DO NOT MERGE