am 4b8ad9ef: Merge from gingerbread

* commit '4b8ad9effd95508e9966b8a3a355f0a948558ae2':
  Fix delivery report error with PENDING status in SMS
tree: 60969926e0f1cb7d05090956002d88254e7139dd
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE