tree cba62d0d64153aa2169651696bc238591341d679
parent 960d466dba2a06cf9359d5e2af8368bba3f9e37c
parent 2e9a8304302ef84191d29fa62e7f3ef00c636043
author Baligh Uddin <baligh@google.com> 1414085428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085428 +0000

am 2e9a8304: (-s ours) am c7e670e2: (-s ours) am de4817e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '2e9a8304302ef84191d29fa62e7f3ef00c636043':