tree 99ba1b9f375916570a524901f38a9948d46add59
parent 49c656dec91e46beb37886564615b97fcad2e677
parent eb6fabd11a8c639fe64c604bb868949ab94cd8ea
author Baligh Uddin <baligh@google.com> 1443284069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443284069 +0000

am eb6fabd1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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