tree d4f5d2353cff7f60cd050a1e03503121ca5b9492
parent d67140414bde8d7b5d6f809a7bf8ada466428eaf
parent d89198df612183e16d6cd8206ee354ae98606756
author Baligh Uddin <baligh@google.com> 1384443471 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384443471 -0800

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

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