tree 2ef1b21820ade87c92923403edc6cd8a2a820d31
parent 2ff3681f5a1fe071b629a06ad846b9d93cb16211
parent d734c20e322e335a7a8405cac2bb9ae5b3958705
author Ying Wang <wangying@google.com> 1344447835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344447835 -0700

am d734c20e: (-s ours) Import translations. DO NOT MERGE

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