tree f49ae6824926d50451e7d938bf559b97306d2d21
parent f5d2e4353343a7657773478add76a541dd0ea7ab
parent 04678abbe56051871e83c63bf8328118c432e47c
author Baligh Uddin <baligh@google.com> 1412088914 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412088914 +0000

am 04678abb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '04678abbe56051871e83c63bf8328118c432e47c':
  Import translations. DO NOT MERGE