tree 3cdbf3b2b877a494ef6136b3cfef146419363f1c
parent a8562f004416b71fda75fa48ad2949190a190d74
parent 27fef7c109687b6ec6cb156cc9ca63067276705b
author Baligh Uddin <baligh@google.com> 1413748975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413748975 +0000

am 27fef7c1: (-s ours) am 0331c1fe: (-s ours) Import translations. DO NOT MERGE

* commit '27fef7c109687b6ec6cb156cc9ca63067276705b':
  Import translations. DO NOT MERGE