tree 42f2e90af61c63ab195e72a230b8cf98e9674ec3
parent 5d67dcb792f4799c8aff6f2b2db74b28eff0b3d2
parent a72d51b6a4b5dadc0dea91882e0cdafc97c652b3
author Eric Fischer <enf@google.com> 1338488049 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338488049 -0700

am a72d51b6: Import translations. DO NOT MERGE

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