tree 9b5ffbe71549610438a3374721d5c81a3e88c77f
parent 7d8472ff806f463610b10094dd436903357e111d
parent 7cc40b59ae530d5819a40c10a6f2571fba5c1693
author Eric Fischer <enf@google.com> 1328897232 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897232 -0800

am 7cc40b59: Import translations. DO NOT MERGE

* commit '7cc40b59ae530d5819a40c10a6f2571fba5c1693':
  Import translations. DO NOT MERGE