commit | 72bad18661682f838c156038fdb6879160c83fdb | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri May 25 14:03:02 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 25 14:03:02 2012 -0700 |
tree | 8b2c2b135bab9ef84ee4377434f6c686976dc87c | |
parent | d84f9df0432b8daa0602bfb43ad389d795d0f488 [diff] | |
parent | 425f92b5c168cd91536600051decf31fb34baf2d [diff] |
am 425f92b5: (-s ours) am 2d16e4e7: Import translations. DO NOT MERGE * commit '425f92b5c168cd91536600051decf31fb34baf2d': Import translations. DO NOT MERGE