tree 696d35b58eea07325f0a839d95eafdf79f9c0583
parent 3368500217281a4325ddba76f01dfbe004cbb0e7
parent 5412bc993124ae5ce72a6ac88fd942ba3f43eca4
author Eric Fischer <enf@google.com> 1328897460 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897460 -0800

am 5412bc99: (-s ours) am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGE

* commit '5412bc993124ae5ce72a6ac88fd942ba3f43eca4':
  Import translations. DO NOT MERGE