| commit | cd617f6cbef7e3449648b26bf37d44422b719937 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 23:47:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 23:47:51 2014 +0000 |
| tree | f466737f0d3f5df74a83370089525a22d8cab446 | |
| parent | 50d4d2d39a041fcb2ee0c56d9425650e2f8557bd [diff] | |
| parent | 6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d [diff] |
am 6acdd044: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE * commit '6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d': Import translations. DO NOT MERGE