tree f49ae6824926d50451e7d938bf559b97306d2d21
parent faa59573e73b1732a8129adcd7e9d33d189d750a
parent 5ce474d71e6104095dfcdce56fac56eedbf41199
author Baligh Uddin <baligh@google.com> 1412088915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412088915 +0000

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

* commit '5ce474d71e6104095dfcdce56fac56eedbf41199':
  Import translations. DO NOT MERGE