tree 2328475f2533559d348a0fe7f912157d2bb6f57b
parent eb4f9744d0576706ac3972b115441011078bb6cd
parent c758844665309f66d75578e1c2b5f586db5c2971
author Baligh Uddin <baligh@google.com> 1367874168 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367874168 -0700

am c7588446: (-s ours) Merge "Import translations. DO NOT MERGE"

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