tree f9341fb1251bb3df8a22fea35a40a453d58391a7
parent bf8859d8b023eaf5d1f3fa186ce9cb85e15e1e81
parent b158819d4b86e920413b5cc57e168357a0fb4203
author Baligh Uddin <baligh@google.com> 1387432121 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387432121 +0000

am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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