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