tree 2cfa55ef4c1e2d0fe7dcc551a5b282bc5926ecfb
parent 856ef6ffb3d3272f7edc359d8adb84fdc5561325
parent 3710612fb48d716aa3ee7818cdc6101281602a58
author Eric Fischer <enf@google.com> 1328897730 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897730 -0800

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

* commit '3710612fb48d716aa3ee7818cdc6101281602a58':
  Import translations. DO NOT MERGE