am b134b203: Merge change Id8c9cb2f into eclair

Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
tree: 16d77dec0083367d176fb64338594a964243d895
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE