OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9f9441
4953ec1
)
am 4953ec1c: am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult...
author
Dianne Hackborn
<hackbod@google.com>
Tue, 28 Feb 2012 23:10:39 +0000
(15:10 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 28 Feb 2012 23:10:39 +0000
(15:10 -0800)
* commit '
4953ec1c71c4c2c134da2c969945c0d8b4fcb03c
':
Fix issue #
6073913
: onActivityResult() not getting called...
1
2
services/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/java/com/android/server/am/ActivityStack.java
Simple merge