tree 4ca5bf08fec99db207fca7335ae5c5b02d34ad92
parent e03ea334d2bb88ff10ccf5b3622f0b81aee07ce9
parent 35eb9ea18ea3086d9f264c285988246116624a6e
author Baligh Uddin <baligh@google.com> 1412094704 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412094704 +0000

am 35eb9ea1: (-s ours) Import translations. DO NOT MERGE

* commit '35eb9ea18ea3086d9f264c285988246116624a6e':
  Import translations. DO NOT MERGE