tree 3209fd90c318c34e54101a7fa95080225fa98356
parent ac3ce43721f09d0083d203152f8868c014615384
parent 31b1273954aad0ed70c3152971b449d1c6a68f4e
author Eric Fischer <enf@google.com> 1328897111 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897111 -0800

am 31b12739: Import translations. DO NOT MERGE

* commit '31b1273954aad0ed70c3152971b449d1c6a68f4e':
  Import translations. DO NOT MERGE