tree c413c3bfb780d3e15e926e6039bbf0311c94efaf
parent dfe94934c177fd38e8ab7835dd4978154c922828
parent 5e2fe9544e8d4a48cad1a7626b808e291981f173
author Ying Wang <wangying@google.com> 1340218074 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340218074 -0700

am 5e2fe954: (-s ours) am 094e99c9: Import translations. DO NOT MERGE

* commit '5e2fe9544e8d4a48cad1a7626b808e291981f173':
  Import translations. DO NOT MERGE