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

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

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