tree 10da860fcff71886af91d082e31f0e1917926848
parent 012322fca2faa6b391427c987f0d2a959c5eca28
parent 8456a64591db19a8bee895a1a5febf3777e5b971
author Baligh Uddin <baligh@google.com> 1414566265 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566265 +0000

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

* commit '8456a64591db19a8bee895a1a5febf3777e5b971':