tree 4832dddc26ca2c3342a3f62bbebb6704c34bf9bb
parent 06c2bf575b070bd47f0874155d9cfacba2538747
parent 5c1823c4a2df774b57a2ee09a1fcb396845328a4
author Eric Fischer <enf@google.com> 1338399744 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338399744 -0700

am 5c1823c4: Import translations. DO NOT MERGE

* commit '5c1823c4a2df774b57a2ee09a1fcb396845328a4':
  Import translations. DO NOT MERGE