Merge change I8dfd6ea8 into eclair

* changes:
  Handle bad lines in /proc/wakelocks : Fix for 2124260
tree: 538b17427f6a300e3b5300d7154eba3bfc923bf1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE