tree 95d806926d859cd9f2939d0557da3acb5748da7e
parent ae7e8979a5c917e1263df4e96728f82223cf1f98
parent f6eb12f481511b03c0455f2694f677fe1e03b649
author Eric Fischer <enf@google.com> 1336155939 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336155939 -0700

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

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