tree eb6b23cff810970054064862da2d14f98f1320f6
parent 175884a4a03a213ba90e90feb31123104106fc30
parent b5ff5baf8bf2858a787a5c71da4a92be762045ed
author Baligh Uddin <baligh@google.com> 1351702034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351702034 -0700

am b5ff5baf: (-s ours) am 22583be7: Import translations. DO NOT MERGE

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