tree 938a6dd806ac939bd509c3bc130a58b1b0a4b196
parent b89ac616a050fa5efd12c9d5e034bd8780d0446e
parent eb1e4b14c979b36abbd6869ee300ec69936afb55
author Baligh Uddin <baligh@google.com> 1443030160 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443030160 +0000

am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'eb1e4b14c979b36abbd6869ee300ec69936afb55':
  Import translations. DO NOT MERGE