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

* commit '11f343c6b1b6a420c0a375edbb7c35d2fdb32482':