tree 939050a8df59c6de44232a01aa5a3a61995081d9
parent e81b4ec22badb67636db3d3df82740ad02cd3086
parent 62b87d52e62b79e080ccf19f099ac6c5f5fa649b
author Baligh Uddin <baligh@google.com> 1380840298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380840298 -0700

am 62b87d52: (-s ours) am caa970cb: (-s ours) am d2e86a66: (-s ours) Import translations. DO NOT MERGE

* commit '62b87d52e62b79e080ccf19f099ac6c5f5fa649b':
  Import translations. DO NOT MERGE