tree 6b645b5f29d9e06b15a0fa4cbd1d6d5a1e2b17ff
parent b2539a8e2245eb42fa056f5ab738825d295f6048
parent 747714521ff9477a669de78cd19761cc6429504e
author Baligh Uddin <baligh@google.com> 1381532624 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381532624 -0700

am bac8965c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit 'bac8965c83b939792385bea73587bef2985c47a8':
  Import translations. DO NOT MERGE