am 11f343c6: am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1

* commit '11f343c6b1b6a420c0a375edbb7c35d2fdb32482':
tree: 4ea6997ff3c07628f760bf7d6f9de00dcc6606a2
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE