tree cba62d0d64153aa2169651696bc238591341d679
parent 0735e3095f737c8fd3decce1dead4377a2d379fa
parent 7e638c722830ed05a2aa17fc1fc02d7842b8103d
author Baligh Uddin <baligh@google.com> 1414085362 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085362 +0000

am 7e638c72: (-s ours) am 34df5a5b: (-s ours) am a678d906: (-s ours) am 3aadac7f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '7e638c722830ed05a2aa17fc1fc02d7842b8103d':