am 6b1118fc: am 2875a3cc: (-s ours) Merge change I0ae41e06 into eclair

Merge commit '6b1118fc8cfba19e3d4cb57c849212c21cde26d5' into eclair-mr2-plus-aosp

* commit '6b1118fc8cfba19e3d4cb57c849212c21cde26d5':
  Import revised translations.  DO NOT MERGE
tree: 3305d62334a47eb27ec7361ea58e8d392788bf1c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE