tree e03fd8133da6c5cec6bdbc4ee7fe529011203e29
parent e0599b10e899abed64a5b66a6c8c6b9d7fa8daa9
parent c125a6a9b07ee6d3a79dd64ac8f08e3ef1f4ce88
author Baligh Uddin <baligh@google.com> 1381179620 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381179620 -0700

am 1a018353: (-s ours) am 609dd2ea: (-s ours) Import translations. DO NOT MERGE

* commit '1a0183532c0e7762fd9d7768e0d3ff23f7532a63':
  Import translations. DO NOT MERGE