tree 638dffc993d5540d45d1831eb1a0c05a9ea3be3c
parent bc9cf0ace850d6ab594c20d1a19c380a8cf53e67
parent 72bde83bb84b9f8d19d1a1c1c3abb72bfdb8fdb6
author Baligh Uddin <baligh@google.com> 1443539015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443539015 +0000

am 72bde83b: (-s ours) am d6ad445e: (-s ours) Import translations. DO NOT MERGE

* commit '72bde83bb84b9f8d19d1a1c1c3abb72bfdb8fdb6':
  Import translations. DO NOT MERGE