am 0f6dd450: (-s ours) am f54d7a2c: am a3cf93a2: (-s ours) Merge change I3ff67703 into eclair

Merge commit '0f6dd4506fea5ebb04fb145ec5120ab6b6d36e4b'

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