| commit | 9f448819c1b49faf6d77ad9144bcb87a5176d870 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:43:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:43:07 2015 +0000 |
| tree | fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5 | |
| parent | 403bd62c01375910bddb89c7c8dd09ef3fca0ee7 [diff] | |
| parent | 86b877df80d517c8adf5163c0fd7c4190c62334f [diff] |
am 86b877df: (-s ours) am cf2b3aea: (-s ours) Import translations. DO NOT MERGE * commit '86b877df80d517c8adf5163c0fd7c4190c62334f': Import translations. DO NOT MERGE