tree cba62d0d64153aa2169651696bc238591341d679
parent 38ede6d74bf3b70e86a6eb99307dae79df45976e
parent a003c8ede8026fac754c059c90fde5bc9ba6e309
author Baligh Uddin <baligh@google.com> 1414092782 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414092782 +0000

am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE

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