commit | e4b39596433f705e5d0e1a06ccabcc9772d365b5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon May 25 13:52:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 25 13:52:24 2015 +0000 |
tree | 884d992ca4cfa7df4e23a225136db70a9176c76f | |
parent | fa1cb7b634537e219555e78fef77c1f17f1952f5 [diff] | |
parent | e3dde1bfa03aa2d6253b6846e68216174a4123d7 [diff] |
am e3dde1bf: (-s ours) Import translations. DO NOT MERGE * commit 'e3dde1bfa03aa2d6253b6846e68216174a4123d7': Import translations. DO NOT MERGE