| commit | 6ddf7eaaa2fc01431e3b71188a3c40674539d7fe | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 20:43:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 20:43:36 2014 +0000 |
| tree | 6c4d66d38abe2d4657c28156788ca386d65462d8 | |
| parent | 0e333b8ad819a105e56dcf36bf9ef2487e60b048 [diff] | |
| parent | 26bc8ca28401a108dbc0e686441c6501ff525750 [diff] |
am 26bc8ca2: (-s ours) am d22d556a: (-s ours) Import translations. DO NOT MERGE * commit '26bc8ca28401a108dbc0e686441c6501ff525750': Import translations. DO NOT MERGE