am fe50b63f: am 7bb7e992: Merge change Ia8ac904d into eclair

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

* commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe':
  fix [2182249] [MR1] valgrind error in surface flinger
tree: 3d159333370f008c45b9555e97f718981da834fe
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE