tree a3ae520a31e0160f90fd865f77d7b01905e50164
parent 48da3c60dc67089a32dd9437bd7fc1855c783f5c
parent 94904606f6961816429fa4f5a15ac3ba3785a4f8
author Baligh Uddin <baligh@google.com> 1398350717 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398350717 +0000

am 94904606: (-s ours) am 0f260324: (-s ours) am 839ab5f2: (-s ours) Import translations. DO NOT MERGE

* commit '94904606f6961816429fa4f5a15ac3ba3785a4f8':
  Import translations. DO NOT MERGE