OSDN Git Service

am 4953ec1c: am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult...
authorDianne Hackborn <hackbod@google.com>
Tue, 28 Feb 2012 23:10:39 +0000 (15:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Feb 2012 23:10:39 +0000 (15:10 -0800)
commit00e6fc4c738a766c6f42b144c473385b944aa399
tree9dd6bba1e349795cc07bd5e9080c6ae97843d4b7
parentd9f94416fcca8bd091075d1058eade91811b798f
parent4953ec1c71c4c2c134da2c969945c0d8b4fcb03c
am 4953ec1c: am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1

* commit '4953ec1c71c4c2c134da2c969945c0d8b4fcb03c':
  Fix issue #6073913: onActivityResult() not getting called...
services/java/com/android/server/am/ActivityManagerService.java
services/java/com/android/server/am/ActivityStack.java