tree cba62d0d64153aa2169651696bc238591341d679
parent 413d81156fc7fbef4013bf6add7d6d90b8874a48
parent f3804c181bb8ba988c417f365067df9dc416fdb2
author Baligh Uddin <baligh@google.com> 1414085453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085453 +0000

am f3804c18: (-s ours) am 1b2ee8c1: (-s ours) am 286ecf1e: (-s ours) Import translations. DO NOT MERGE

* commit 'f3804c181bb8ba988c417f365067df9dc416fdb2':