am c1bc2199: am bae63831: (-s ours) Merge change Iec0c9b13 into eclair

Merge commit 'c1bc21993fed97377563a7ff4b69a2844ce74b07' into eclair-mr2-plus-aosp

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