tree cba62d0d64153aa2169651696bc238591341d679
parent 445649988f96c1d9b9a817f49c8d9ad825401498
parent 80480a9dca4471751f5d5503a2a2dbc287cf1ff5
author Baligh Uddin <baligh@google.com> 1414085364 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085364 +0000

am 80480a9d: (-s ours) am bdcc7d4a: (-s ours) am be3adf36: (-s ours) am 80a603f7: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit '80480a9dca4471751f5d5503a2a2dbc287cf1ff5':