tree cba62d0d64153aa2169651696bc238591341d679
parent 5826c3c15640635619a531c49cb30997ac922204
parent c7cdc43ef3f3fb7799dbf2fc68be96c70cdc422c
author Baligh Uddin <baligh@google.com> 1414085556 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085556 +0000

am c7cdc43e: (-s ours) am 72af7f8d: (-s ours) am 72b4c7c3: (-s ours) am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE

* commit 'c7cdc43ef3f3fb7799dbf2fc68be96c70cdc422c':