| commit | c54d8bae7839883ffdb5081c210efddbee8c7ed3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:00:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:00:26 2015 +0000 |
| tree | 6434cfc582ea1b479ab9a3335b816b67082c4d82 | |
| parent | 1500ee0522436b11cae8f6ec240c98fa1144b5c8 [diff] | |
| parent | eb0be29edc8e7144f529da9ce0b20312de699329 [diff] |
am eb0be29e: (-s ours) Import translations. DO NOT MERGE * commit 'eb0be29edc8e7144f529da9ce0b20312de699329': Import translations. DO NOT MERGE