tree cba62d0d64153aa2169651696bc238591341d679
parent 8a11f4bc4659efb776ca96f742b78063f6c3e8f0
parent cd0f6e0cd5ab3271897064b28cecc50c0a481ca8
author Baligh Uddin <baligh@google.com> 1414085545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085545 +0000

am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit 'cd0f6e0cd5ab3271897064b28cecc50c0a481ca8':