tree 6afa66dae5d2124106f824f450c690bb058ba642
parent 57c82bf0bc369b7313c4a9ddec4ae933d025e91b
parent 8430094cd9ecfcb932014ed5ae2d3db095bc7382
author Eric Fischer <enf@google.com> 1323471490 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323471490 -0800

am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
  Import revised translations. DO NOT MERGE