tree 73b07a8490f3ab95a23e31af027199ec31b7c356
parent d423986e68d76958441c3bec1584a86f7f390988
parent c71d89a8268cdc445b1b07e9f5a97372f8593629
author Baligh Uddin <baligh@google.com> 1396622679 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396622679 +0000

am c71d89a8: (-s ours) am ab0c43a4: (-s ours) am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

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