tree f19f92d5d64f64a4b7a8d5a0e83495ff7cfee23d
parent 6bbdc2b3912d42e5ad258a69f6772f63b9462455
parent cd2d40ddd910a6ac5cbee603a248de9980a4eee7
author Eric Fischer <enf@google.com> 1318963581 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963581 -0700

am cd2d40dd: (-s ours) am 4c580173: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'cd2d40ddd910a6ac5cbee603a248de9980a4eee7':
  Import revised translations.  DO NOT MERGE