tree 1f73d388f5b053f3afc357da49a2916f7e0ab9e7
parent 239204a1a124c66d3465e2fd44a60c776a62123d
parent bb10598e0adf417a319d0e854faa8212090c4842
author Baligh Uddin <baligh@google.com> 1408284631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408284631 +0000

am bb10598e: (-s ours) am d9b329ba: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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