am 65a277d2: am ecdb8f86: Merge change I789085a5 into eclair

Merge commit '65a277d22c33a1bceb801be899e3594615f0d44f'

* commit '65a277d22c33a1bceb801be899e3594615f0d44f':
  Fix problems in NexusGL:
tree: 1462a880120c3a1b9a0c7c4f0f237efa2fc3011d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE