Merge change 25153 into eclair

* changes:
  Reconcile the character popups for the hard and soft keyboards.
tree: ee80308d497989fc9644336d2518af655aae3f35
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE