| commit | 06b284f22b51cb27ecad920ee1fa11806e45d935 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 14:43:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 14:43:43 2014 +0000 |
| tree | 4182d6fb811b8ce0c589c32b66d97c946b8ea617 | |
| parent | da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5 [diff] | |
| parent | b6a5dab3ed29c9c9bc864abff0e534641dcd4f32 [diff] |
am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE * commit 'b6a5dab3ed29c9c9bc864abff0e534641dcd4f32': Import translations. DO NOT MERGE