tree 7d17a634ea7174488a2386cef00c0e60d36da904
parent 6b79a0841068a7ef6a1487c9a51660e2c2a38ec4
parent 923754875633f7ae8753f66009c53c4251b9292a
author Baligh Uddin <baligh@google.com> 1392410209 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410209 +0000

am 92375487: (-s ours) am 36a300e1: (-s ours) am e1bc1951: (-s ours) Import translations. DO NOT MERGE

* commit '923754875633f7ae8753f66009c53c4251b9292a':