tree cba62d0d64153aa2169651696bc238591341d679
parent 02aefa8d2ec8088f7312b4ac9ab5251458a43d23
parent c96224cb116972574e4820295909401d503ff8aa
author Baligh Uddin <baligh@google.com> 1414085235 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085235 +0000

am c96224cb: (-s ours) am 85384d66: (-s ours) am 6e0d2c19: (-s ours) am 90ec376f: (-s ours) Import translations. DO NOT MERGE

* commit 'c96224cb116972574e4820295909401d503ff8aa':