tree eaa5fc327eb684119ce82430850b0207f87f1f07
parent 86ac54b10762baec444c28eb22d1ebd22ef4ee3a
parent f058c3e790e5d5d811a925808111abf4671f439e
author Ying Wang <wangying@google.com> 1340213121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340213121 -0700

am f058c3e7: (-s ours) am 705d8085: Import translations. DO NOT MERGE

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