commit | bf01b62901cc6009d1284d3940a7a8b9e9a6e0d8 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri Feb 10 10:54:05 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:54:05 2012 -0800 |
tree | 9bd3f834455a5225686e1a25e804f0304e2aa0fe | |
parent | 073ea09bbf41318a1b2a2b809cd4774a1988dc66 [diff] | |
parent | 5d0aeda964e23e6b96a24539c6430146cc9426e9 [diff] |
am 5d0aeda9: (-s ours) am f2cacdae: am c85dde47: Import translations. DO NOT MERGE * commit '5d0aeda964e23e6b96a24539c6430146cc9426e9':