tree fc49ae1e9cd9c35b35314536ce995214adcd0e9c
parent 6aad68aea028eaa049454764867daccdaf67fc54
parent 5158aa191572cd54a543f441a58c794766dd1cd2
author Baligh Uddin <baligh@google.com> 1400728611 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400728611 +0000

am 5158aa19: (-s ours) am 8da7aabf: (-s ours) Import translations. DO NOT MERGE

* commit '5158aa191572cd54a543f441a58c794766dd1cd2':
  Import translations. DO NOT MERGE