| commit | 36b822e56d40c3ceca48d33137b913976c9d5867 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:08:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:08:31 2015 +0000 |
| tree | f2d5ea082d5f96d46e9a5328074e85eedb7f4cd8 | |
| parent | 6afe8df0b8af1a434931c77bb7d8ce865ec17b53 [diff] | |
| parent | ff19acd73db88cbb51df9bc41c860b3ab50e7416 [diff] |
am ff19acd7: (-s ours) am 05ffc726: (-s ours) am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE * commit 'ff19acd73db88cbb51df9bc41c860b3ab50e7416': Import translations. DO NOT MERGE