tree cba62d0d64153aa2169651696bc238591341d679
parent 862001a2ea1bb9565d8d945f0a4b27f9134a3ba5
parent 16e56d7511ddfc797b2233494654858d6ae5421d
author Baligh Uddin <baligh@google.com> 1414085456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085456 +0000

am 16e56d75: (-s ours) am 588975f0: (-s ours) am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '16e56d7511ddfc797b2233494654858d6ae5421d':