tree 10da860fcff71886af91d082e31f0e1917926848
parent 86dbc15ae5550bc631b4cef46b08a6a9fcb4fc9d
parent 0b554719eeea18e74f9030a40173996623ec512d
author Baligh Uddin <baligh@google.com> 1414566336 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566336 +0000

am 0b554719: (-s ours) am 7e0c4215: (-s ours) am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE

* commit '0b554719eeea18e74f9030a40173996623ec512d':