tree cba62d0d64153aa2169651696bc238591341d679
parent 0b554719eeea18e74f9030a40173996623ec512d
parent 6c983895cd42b71ddb43756f92be7420024ba908
author Baligh Uddin <baligh@google.com> 1414085455 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085455 +0000

am 6c983895: (-s ours) am fdfebdad: (-s ours) am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE

* commit '6c983895cd42b71ddb43756f92be7420024ba908':