tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent e138bbcdd7f0dccf21b351fe1253a4b58d727b6a
parent aaadf294c57275844b9b436d66a79150ad2b25b5
author Baligh Uddin <baligh@google.com> 1410890614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410890614 +0000

am aaadf294: (-s ours) am 2790a98c: (-s ours) Import translations. DO NOT MERGE

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