| commit | 43826e669679b7463cf715a7003e5641f7d24e78 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 14:43:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 14:43:37 2014 +0000 |
| tree | a4f7304fe230889ebc64fd98a1a750ce706a4750 | |
| parent | a6f6e5a35be333921f47d768d053054280552fa5 [diff] | |
| parent | d33d2127f739083c2f23a99eecd6bc3f21b53b83 [diff] |
am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE * commit 'd33d2127f739083c2f23a99eecd6bc3f21b53b83': Import translations. DO NOT MERGE