tree 81401e15c4c34eaae17542abce386ffbf13b5be1
parent 61fdd649905eb79ecdafa909fbd1a3f2521914ea
parent d63cdafebd6129aa796a8996acc75fb5a6026db6
author Baligh Uddin <baligh@google.com> 1414388541 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414388541 +0000

am d63cdafe: (-s ours) am 96510f12: (-s ours) am 4f365804: (-s ours) Import translations. DO NOT MERGE

* commit 'd63cdafebd6129aa796a8996acc75fb5a6026db6':