| commit | 1369b078b268636422a69989729c234e16939094 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 13:53:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 13:53:49 2015 +0000 |
| tree | 70942743a54834f03191d30679edc384973c925b | |
| parent | 558524d2f7dc68051f0b3353a5088f2f41001aee [diff] | |
| parent | ce17cd28caee70b361a1b70c3ae5817714ab47ea [diff] |
am ce17cd28: (-s ours) am 94491f6c: (-s ours) Import translations. DO NOT MERGE * commit 'ce17cd28caee70b361a1b70c3ae5817714ab47ea': Import translations. DO NOT MERGE