tree 9253121953d6ea670f71b2a597c6f0aff121f575
parent c9cd963da6f63638512cb22c19f779a0a97ea5ae
parent 7fc07ddfaf221d5b6b85e585f4151871df4c777a
author Baligh Uddin <baligh@google.com> 1386866221 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386866221 -0800

am 7fc07ddf: (-s ours) Import translations. DO NOT MERGE

* commit '7fc07ddfaf221d5b6b85e585f4151871df4c777a':
  Import translations. DO NOT MERGE