tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 3545b0e6a85f58ebbf14d131325ed64020510ccd
parent 5021737b47b56c719547cad6812aca415f708a73
author Baligh Uddin <baligh@google.com> 1426893161 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893161 +0000

am 5021737b: (-s ours) am 05782843: (-s ours) am c9ccb555: (-s ours) Import translations. DO NOT MERGE

* commit '5021737b47b56c719547cad6812aca415f708a73':