tree cba62d0d64153aa2169651696bc238591341d679
parent b6ec3c71ee23e8e1eb5d2d8de27eaac784fb3750
parent 1ca1e4e4d585c2aa09436ff2ec9ea07c8b3e4723
author Baligh Uddin <baligh@google.com> 1414085265 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085265 +0000

am 1ca1e4e4: (-s ours) am a371f3eb: (-s ours) am edaa63a3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '1ca1e4e4d585c2aa09436ff2ec9ea07c8b3e4723':