tree 53b64f5175f85ae221cf262df74faa9dffe0bc3c
parent fde1f5c6fa657f0653733b6f7ea8101ccd5dd4e3
parent c4b29ac9b192f0e114b28a04e873ef084ed048dc
author Baligh Uddin <baligh@google.com> 1379214693 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379214693 -0700

am c4b29ac9: (-s ours) am 0e81e747: (-s ours) Import translations. DO NOT MERGE

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