tree cba62d0d64153aa2169651696bc238591341d679
parent 725648ecd0366c740f205efd3664daba1d5d0f98
parent 7e0c421585928f7de9336f6af45000b2e3ca9ddc
author Baligh Uddin <baligh@google.com> 1414085454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085454 +0000

am 7e0c4215: (-s ours) am bb69c0d8: (-s ours) am 572bdaa4: (-s ours) am f0d79e57: (-s ours) Import translations. DO NOT MERGE

* commit '7e0c421585928f7de9336f6af45000b2e3ca9ddc':