Merge change I5ad37324 into eclair

* changes:
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
tree: 5cf1b88e84f34deaad703bc7c8bc80cf8acf1414
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE