| commit | 4bfd47c279393a953f5674dd6bcc39805e6176ba | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu May 31 12:38:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 31 12:38:48 2012 -0700 |
| tree | 4e0dcfa3e0e95a6c0540f6029a8b175c64984f27 | |
| parent | 9835364df3a3cf8d3299feb43f5eeb82e547a99e [diff] | |
| parent | f25bfaa783c682e5328a07b58584644661c97661 [diff] |
am f25bfaa7: (-s ours) am 87543c6d: Import translations. DO NOT MERGE * commit 'f25bfaa783c682e5328a07b58584644661c97661': Import translations. DO NOT MERGE