tree c65a1c72ceabdf9e6cee07e41a634bd4aa50706e
parent 1f067222c66e00de5bf2f74b69033359d918c9ff
parent da13330d9b1dc994ae2ea4e5c39b0f6ff6f87ac9
author Baligh Uddin <baligh@google.com> 1382581774 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382581774 -0700

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

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