tree cba62d0d64153aa2169651696bc238591341d679
parent f5548455bb7d6ea4ea51bdafb6698764782766e0
parent 5560a6d60c00528ca0b97e7c9a5b1622f8ab9cd2
author Baligh Uddin <baligh@google.com> 1414085234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085234 +0000

am 5560a6d6: (-s ours) am 8608b163: (-s ours) am e02cb223: (-s ours) Import translations. DO NOT MERGE

* commit '5560a6d60c00528ca0b97e7c9a5b1622f8ab9cd2':