tree bfd832d5976d60b1674a0c90c26ec67c69c7d391
parent b1f7866b65c80a0b5599acf0cd2dbf50876bb9ea
parent 56928729b2c1e3f2f09435b882afc6a5c6987803
author Baligh Uddin <baligh@google.com> 1392411124 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411124 +0000

am 56928729: (-s ours) am 92375487: (-s ours) am 36a300e1: (-s ours) am e1bc1951: (-s ours) Import translations. DO NOT MERGE

* commit '56928729b2c1e3f2f09435b882afc6a5c6987803':