tree ca42153c9732c1e571305fa2322d48c4ee69f5e7
parent e87d6efc8f80f42a86738315a045634c77eb5612
parent 400981551b30ad5bb935c2888218e73c1cecff04
author Baligh Uddin <baligh@google.com> 1442631357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631357 +0000

am 40098155: (-s ours) am 037b9b64: (-s ours) Import translations. DO NOT MERGE

* commit '400981551b30ad5bb935c2888218e73c1cecff04':
  Import translations. DO NOT MERGE