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

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

* commit '31594acd60d903050a7f25f88c8651f33226cdf8':
  Import translations. DO NOT MERGE