Merge change I4a4323c0 into eclair-mr2

* changes:
  Fixes scroll/measure bug in EditText
tree: 4d8a57bdd445ec07fe3c381bf1e9c7e28735499d
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE