tree cba62d0d64153aa2169651696bc238591341d679
parent 7a50fdff44faba488190cabaa3b907111b31bb06
parent 9d321ecf5c1ed4b3d24b0c227e4b70fc24036279
author Baligh Uddin <baligh@google.com> 1414085223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085223 +0000

am 9d321ecf: (-s ours) am ab9135e4: (-s ours) am d40b2e99: (-s ours) am 4e4d6599: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '9d321ecf5c1ed4b3d24b0c227e4b70fc24036279':