tree 063776de2f32cba7fda1209ad558fd5ba3f0a5df
parent baa4b3eebb8918259349840a44a9b319309bad80
parent b21b749bb333f0ba436c7e6a60a259bfd3cb3987
author Eric Fischer <enf@google.com> 1339005848 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339005848 -0700

am b21b749b: Import translations. DO NOT MERGE

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