| commit | 4d9ee90111837f47a524e479eb161ff52990986d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:54:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:54:12 2015 +0000 |
| tree | 1bb4f74d62ce290fe3d3c8dfc1e606ed5352f72e | |
| parent | b9e4739ac20adfc9f5adb6de46ea4055b88229da [diff] | |
| parent | a5698f209dc9d79382233db011810f8e8f88c2c2 [diff] |
am a5698f20: (-s ours) Import translations. DO NOT MERGE * commit 'a5698f209dc9d79382233db011810f8e8f88c2c2': Import translations. DO NOT MERGE