| commit | b369516b94e6de137c0fc73fd55a01172a432db8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sun Nov 02 19:03:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:03:20 2014 +0000 |
| tree | 1c099be08a9868a9d9d733b091b2029a0c1d7ff8 | |
| parent | 86e9a92c8750ec48689cc24f202b7cc1d54fd56f [diff] | |
| parent | c702530866f25ac5d88c1a94e27c76a166afd65a [diff] |
am c7025308: (-s ours) am 08fdc12c: (-s ours) am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev * commit 'c702530866f25ac5d88c1a94e27c76a166afd65a': Import translations. DO NOT MERGE