tree 1f4fc9d7fbb194f70ad87ee8bc254b70b7718477
parent 20bc2fef754d5a90ea72b351001f80b328f271d6
parent dde48bc8174b841fa512c4e0f2aef595ccedd5c2
author Baligh Uddin <baligh@google.com> 1380896642 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380896642 -0700

am da5cd8c4: (-s ours) Import translations. DO NOT MERGE

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