tree e5a37d8ac695e76a2c4610fe9edd8f4186ae0d67
parent 905a5b1477b3a1899ef389dbe081f9c70a4fe13d
parent 53b3d44f524c162a18ca91034c90ac9f7e62e561
author Baligh Uddin <baligh@google.com> 1396311357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396311357 +0000

am 53b3d44f: (-s ours) am dc5e02bd: (-s ours) Import translations. DO NOT MERGE

* commit '53b3d44f524c162a18ca91034c90ac9f7e62e561':
  Import translations. DO NOT MERGE