commit | 6901fc18f527267636bedb94ad51594946e62c5c | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Jun 05 09:20:29 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 05 09:20:29 2012 -0700 |
tree | 9ff71d414f8115c5fe41d4b4f0307ff25f8efd71 | |
parent | 86ed70f48771553363ca9a580821203cd406eaff [diff] | |
parent | d3ac513367a88f850812e5dbce9e1ff9760c8a48 [diff] |
am d3ac5133: (-s ours) am 25005bf5: Import translations. DO NOT MERGE * commit 'd3ac513367a88f850812e5dbce9e1ff9760c8a48': Import translations. DO NOT MERGE