| commit | 2c5d427d9b846bd1ddffa89a9337a23249bbf378 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 20:25:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 20:25:17 2015 +0000 |
| tree | a46729815601e4e689f332011f0e14faf90c571c | |
| parent | d4838a3d6d05403bb76e2c4c163ead0e06b72c8f [diff] | |
| parent | 6ff988b614bf23cbb1b9e4b545a5739a8480257a [diff] |
am 6ff988b6: (-s ours) am f2edc519: (-s ours) Import translations. DO NOT MERGE * commit '6ff988b614bf23cbb1b9e4b545a5739a8480257a': Import translations. DO NOT MERGE