tree 9ed1e17768b8c2f40ea882b36a991f4c40fd1cc7
parent fb6cdc6434597ab2ec2689f44c83edcc5cffaa1e
parent d173b10a930b56cfd71ca36d0051230b3f9593c1
author Ying Wang <wangying@google.com> 1342667916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342667916 -0700

am d173b10a: (-s ours) am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev

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