tree 3e3ecc4095cab471420c700a5a6dec85bac525dc
parent 538c265f66ba96cdffd135ab303351b8ec1b7789
parent 04d181ddd0a29acfffc19094711afce5fac3a18d
author Eric Fischer <enf@google.com> 1300492727 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300492727 -0700

am 04d181dd: (-s ours) am b879135b: (-s ours) am 9d8285fa: Import revised translations.  DO NOT MERGE

* commit '04d181ddd0a29acfffc19094711afce5fac3a18d':
  Import revised translations.  DO NOT MERGE