| commit | f3eb023d60d359d19169be04d417c88c130636f2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 12:54:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 12:54:37 2015 +0000 |
| tree | 4d84e26d089dc9d8fecebef18f8d5a075671862f | |
| parent | eb29ae196e61227396ebb13ca3b6f14d4f00802a [diff] | |
| parent | 50f8944c200e20e6a387e2cade03865ae95368ec [diff] |
am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE * commit '50f8944c200e20e6a387e2cade03865ae95368ec': Import translations. DO NOT MERGE