tree 0de18780b61f01a892da197f6b2ca9ddfe2e0603
parent 1c79addfcbe26d3327b58e0ba8dc42c7c19963a9
parent c1f2a2135162a48607a3e333b13b8e36e62732d9
author Baligh Uddin <baligh@google.com> 1395342155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395342155 +0000

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

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