tree 6d3d58f000829f646c384566054b72c8fe28be42
parent 27d6bf937c3d9934fed171ea69aafaf90c9463e6
parent 6dd670997a88fe7502f9ce0e4f9c872b7352027f
author Ying Wang <wangying@google.com> 1339530356 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530356 -0700

am 6dd67099: Import translations. DO NOT MERGE

* commit '6dd670997a88fe7502f9ce0e4f9c872b7352027f':
  Import translations. DO NOT MERGE