| commit | eb29ae196e61227396ebb13ca3b6f14d4f00802a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 12:48:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 12:48:26 2015 +0000 |
| tree | 4d84e26d089dc9d8fecebef18f8d5a075671862f | |
| parent | 0e58fb83b7dc93ac4f55d21900a4244b3a89cdf0 [diff] | |
| parent | 45289c3d39d24b7530e4478af0120da4a21e2744 [diff] |
am 45289c3d: (-s ours) Import translations. DO NOT MERGE * commit '45289c3d39d24b7530e4478af0120da4a21e2744': Import translations. DO NOT MERGE