tree 6d87006194f353e4365f9c0072e3a44a734d80e1
parent 20dcb55cad5b9a37d8e99265266b573d768b8c95
parent be3adf3673432b03c4002c61a34a2635bd3ee909
author Baligh Uddin <baligh@google.com> 1392410224 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410224 +0000

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

* commit 'be3adf3673432b03c4002c61a34a2635bd3ee909':