| commit | b2f710d9bdda596de2de0ee4cf0ba18cf25a6481 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:34:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:34:41 2015 +0000 |
| tree | df86a0d8e460822f350f089f47b6e7a51a9bfe45 | |
| parent | 836dafe1b8578e0fea2b97dfa32b77c13ea48e54 [diff] | |
| parent | c54d8bae7839883ffdb5081c210efddbee8c7ed3 [diff] |
am c54d8bae: (-s ours) am eb0be29e: (-s ours) Import translations. DO NOT MERGE * commit 'c54d8bae7839883ffdb5081c210efddbee8c7ed3': Import translations. DO NOT MERGE