am 312df73a: (-s ours) Merge change I122ce5c5 into eclair

Merge commit '312df73a1fb84a221a1d1e7fe675f93dbd5230ba' into eclair-mr2

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