tree 8ef203e5c5009b3b167e737fbfff96708ff39388
parent d9a7677b49ac4db4460844bb0d9d9accf648bb45
parent efbb748153311924d79e40e6e1d0efcd9057f2a2
author Baligh Uddin <baligh@google.com> 1414435803 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414435803 +0000

am efbb7481: (-s ours) am b799cb87: (-s ours) Import translations. DO NOT MERGE

* commit 'efbb748153311924d79e40e6e1d0efcd9057f2a2':