tree efb213cd200045d180f3cfff9124fe7630f9cb4f
parent 016c75dd5eb79ab21f784f37576a43d74c750161
parent b8c5df85622155196d5d961f7674547947f5fc08
author Ying Wang <wangying@google.com> 1341949126 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341949126 -0700

am b8c5df85: (-s ours) am 40a4ab13: Import translations. DO NOT MERGE

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