| commit | 1d19a07535e427e22c71dae109587061d34ef697 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:37:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:37:00 2015 +0000 |
| tree | d5edcccb48ea27a5079bd8d786cb962645c9ccb6 | |
| parent | 8bffae5b465d77b62b0d15f343ae592fe9c7d3df [diff] | |
| parent | a1088e4a7599cbcc349efcd568ff11929d377ce6 [diff] |
am a1088e4a: (-s ours) am e15a5b16: (-s ours) am 7011e6de: (-s ours) am f221299b: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit 'a1088e4a7599cbcc349efcd568ff11929d377ce6': Import translations. DO NOT MERGE