tree 9ff71d414f8115c5fe41d4b4f0307ff25f8efd71
parent 86ed70f48771553363ca9a580821203cd406eaff
parent d3ac513367a88f850812e5dbce9e1ff9760c8a48
author Eric Fischer <enf@google.com> 1338913229 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338913229 -0700

am d3ac5133: (-s ours) am 25005bf5: Import translations. DO NOT MERGE

* commit 'd3ac513367a88f850812e5dbce9e1ff9760c8a48':
  Import translations. DO NOT MERGE