tree 10da860fcff71886af91d082e31f0e1917926848
parent 428e5e116e9bc0364dbcf6a034dceff383e73437
parent 5826c3c15640635619a531c49cb30997ac922204
author Baligh Uddin <baligh@google.com> 1414566450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566450 +0000

am 5826c3c1: (-s ours) am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE

* commit '5826c3c15640635619a531c49cb30997ac922204':