| commit | 7f6ff8c6eef11db9cd8f82f8773d8883fad5f822 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 23 22:42:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:42:57 2015 +0000 |
| tree | 48850f33184b22e8760dec79835bf064f986f749 | |
| parent | 5765efd124d95944d7ef2f35cd91fdfbffb86cb4 [diff] | |
| parent | 8d59b117bd4b0fed7d61d081878edd7fee81d54c [diff] |
am 8d59b117: (-s ours) am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE * commit '8d59b117bd4b0fed7d61d081878edd7fee81d54c':