commit | 62559f2ff05aa482967993bd7f2ce04723a22574 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Apr 30 14:05:20 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 14:05:20 2013 -0700 |
tree | e4eab34b50299cabc52491e20d607f70acfb5fbf | |
parent | 01d694e6d54eb967207c7e091383a428547d7c1b [diff] | |
parent | e38f5e2257bb6dec0cf583e63fa61044e45bd288 [diff] |
am 518ea705: (-s ours) am 3164190b: am 20a3b8c7: (-s ours) Import translations. DO NOT MERGE * commit '518ea7056895a68fa82a8074443f8db734180865':