tree 5c1c50c69ada97a448747056a153b382178ef463
parent 7ba3257b383b420f7d2f5006a439f55410c0e0e3
parent f43a32a06d673df3717f2d4ee331d8e2cad88020
author Ying Wang <wangying@google.com> 1340041955 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340041955 -0700

am f43a32a0: (-s ours) am 15254fc3: Import translations. DO NOT MERGE

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