am 558a3c41: am 9b8b1ef9: (-s ours) Merge change If84681a3 into eclair

Merge commit '558a3c412922726416bdb4430d2079da4a390688' into eclair-mr2-plus-aosp

* commit '558a3c412922726416bdb4430d2079da4a390688':
  Import revised translations.  DO NOT MERGE
tree: 8d003d12046c5f6b8bae04c47da3c5ddc41b15df
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE