tree 3786b268f84d6e5b24e8ccbe205659a423785282
parent 370ee42793d9585353c196c4063647c1ea99ea9b
parent e2dd056481acd2ef399ffbb020ff2bc5c1e460eb
author Baligh Uddin <baligh@google.com> 1413748976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413748976 +0000

am e2dd0564: (-s ours) am 01444335: (-s ours) Import translations. DO NOT MERGE

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