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