tree 62b899de504888969cd11828865c83d79d0f1d96
parent 4953ec1c71c4c2c134da2c969945c0d8b4fcb03c
parent c221d6ec2fbaa73f82cd219e2d5ab078697070ab
author Dianne Hackborn <hackbod@google.com> 1330470980 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330470980 -0800

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

* commit 'c221d6ec2fbaa73f82cd219e2d5ab078697070ab':