tree 10da860fcff71886af91d082e31f0e1917926848
parent 02c43e358e87cac154692a38b7063013e46fbf3f
parent 445649988f96c1d9b9a817f49c8d9ad825401498
author Baligh Uddin <baligh@google.com> 1414566288 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566288 +0000

am 44564998: (-s ours) am 0b866e59: (-s ours) am 20dcb55c: (-s ours) am 9a646bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '445649988f96c1d9b9a817f49c8d9ad825401498':