tree 63ce8f0ae8b12681811aeffa2609f81578df9349
parent a07f53e52600eb0a16feec1508808723abf3e111
parent 9f83fb9c0da7de7eb377a19a1b13a86d8835ccb2
author Baligh Uddin <baligh@google.com> 1398219622 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398219622 +0000

am 9f83fb9c: (-s ours) am 04aee4fb: (-s ours) Import translations. DO NOT MERGE

* commit '9f83fb9c0da7de7eb377a19a1b13a86d8835ccb2':
  Import translations. DO NOT MERGE