am d3cfb1bd: Merge change Ia48b3f2a into eclair

Merge commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37' into eclair-plus-aosp

* commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37':
  Fix #2313887: Device doesn't boot after rebooting device...
tree: 7d6b8f233799b2125caf19ccb606d28ad0dc2220
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE