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

Merge commit 'e3264d7234f0568d6619c8955f5480963a2019ff'

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