| commit | 5fa0a93d3ed1ad838fd43a41f4df9703ae206345 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 12:55:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 12:55:33 2015 +0000 |
| tree | 1cb69d678f0bbbcd86592c68e3795644bc4fd9e9 | |
| parent | 793b2a2d444192ee587a643c88e535ebf0c98158 [diff] | |
| parent | 4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202 [diff] |
am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE * commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202': Import translations. DO NOT MERGE