tree 14fdaf5ef9111f3c6818615d577102a741420211
parent 59f8cefdafde65fca57a233c967202f1b1ec0142
parent a5a771ca1fd2fea7c898ad6d1eb616df4e2f38f5
author Eric Fischer <enf@google.com> 1337049682 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337049682 -0700

am a5a771ca: (-s ours) Import translations. DO NOT MERGE

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