tree 6543d28ebca86f49937beeabce59a026ef103e23
parent 64ef17b7bae77162a1e30643979f54515dca04ca
parent 66c0bba118a9d42e84f8abf84c3be57a02960d65
author Baligh Uddin <baligh@google.com> 1410882021 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410882021 +0000

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

* commit '66c0bba118a9d42e84f8abf84c3be57a02960d65':
  Import translations. DO NOT MERGE