tree 10da860fcff71886af91d082e31f0e1917926848
parent c86515c07dfef87871e071ef36c76b730fba7844
parent 7208c8cb92e9f059c1e39e4b91c65f0ac2b6f5cc
author Baligh Uddin <baligh@google.com> 1414566122 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566122 +0000

am 7208c8cb: (-s ours) am c96224cb: (-s ours) am 85384d66: (-s ours) am 6e0d2c19: (-s ours) am 90ec376f: (-s ours) Import translations. DO NOT MERGE

* commit '7208c8cb92e9f059c1e39e4b91c65f0ac2b6f5cc':