| commit | 13688c8b7e84a2ff8017c33db35559b5d0fb878a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 14:02:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 14:02:38 2015 +0000 |
| tree | 1a2f9f69674820540d354e52e905eeb43d03713d | |
| parent | d8296c0e192b71603b3a473cfc696ccfffb04162 [diff] | |
| parent | a95faf780471afea65bb4e5f2b2570e4d9a4e7b9 [diff] |
am a95faf78: (-s ours) Import translations. DO NOT MERGE * commit 'a95faf780471afea65bb4e5f2b2570e4d9a4e7b9': Import translations. DO NOT MERGE