tree 8ef203e5c5009b3b167e737fbfff96708ff39388
parent ccda5e7e95133aa25c79d8711e550a918fc84508
parent bf6cc3dab63abf8daf8510938e4ccb2b62c28bd0
author Baligh Uddin <baligh@google.com> 1410890576 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410890576 +0000

am bf6cc3da: (-s ours) am cf5c527c: (-s ours) Import translations. DO NOT MERGE

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