commit | a2b792e9aeda7686751d5d5c8bb8783be107ccfd | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Wed May 30 11:47:45 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 30 11:47:45 2012 -0700 |
tree | 6e8d7bd3835418a99c662cecb5f91c127d9324b4 | |
parent | 4faee3cfba413413ed54bf9f10ff52b010d03b31 [diff] | |
parent | 3bf487e2273034f0c82f2685bd0208075565178d [diff] |
am 3bf487e2: (-s ours) am f17161d9: Import translations. DO NOT MERGE * commit '3bf487e2273034f0c82f2685bd0208075565178d': Import translations. DO NOT MERGE