tree af466e2cd8df4c8fa227e737f94b23dd92f49ca3
parent 3acb9b5b1e6d270c86b57033eddd67cf5224efa0
parent b62b41d3bad26820aebaca1e1c233f0f367386da
author Baligh Uddin <baligh@google.com> 1354252427 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354252427 -0800

am b62b41d3: (-s ours) am 02d29ff5: am a1b3b99c: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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