| commit | d54e162756778d286fa5b60eb77a741dacfb09cb | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 10 10:20:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:20:10 2012 -0800 |
| tree | 6c896de5d2049b5d98caa8a545c0d068e49a0bed | |
| parent | f5d04b06cf0a32b364402cc7c889d622f8658024 [diff] | |
| parent | 50c3fd3af501215f3d0c00c006fbebd3e7b9bab8 [diff] |
am 50c3fd3a: (-s ours) am a5bb9139: (-s ours) am 5d2ceed5: Import translations. DO NOT MERGE * commit '50c3fd3af501215f3d0c00c006fbebd3e7b9bab8':