tree c88a781aab686b4c9892d009448392c68a173c81
parent 10f0db9f79256b7e02b65f341853d7238480f343
parent b178a36244e4498b482978e1b49cf1a54467f55d
author Baligh Uddin <baligh@google.com> 1382459655 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382459655 -0700

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

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