tree af9ce4eff6c6988752c6266333e77c5b6cf90c6e
parent d40d1322d492f4b8ca7530a535830cf4a59ab0af
parent 1ca63ead10a25dca9889529f44fc4fb0139bb410
author Baligh Uddin <baligh@google.com> 1396469767 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396469767 +0000

am 1ca63ead: (-s ours) am cc95d18d: (-s ours) Import translations. DO NOT MERGE

* commit '1ca63ead10a25dca9889529f44fc4fb0139bb410':
  Import translations. DO NOT MERGE