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:
575d1af
d7cd29d
)
am d7cd29da: Add facility to run setup wizard after an update.
author
Dianne Hackborn
<hackbod@google.com>
Fri, 3 Jul 2009 15:58:10 +0000
(08:58 -0700)
committer
The Android Open Source Project
<initial-contribution@android.com>
Fri, 3 Jul 2009 15:58:10 +0000
(08:58 -0700)
Merge commit '
d7cd29da91ccc0aba1f1097e19366f9ca36c7ce1
'
* commit '
d7cd29da91ccc0aba1f1097e19366f9ca36c7ce1
':
Add facility to run setup wizard after an update.
1
2
core/java/android/content/Intent.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/content/Intent.java
Simple merge
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
services/java/com/android/server/WindowManagerService.java
Simple merge
diff --cc
services/java/com/android/server/am/ActivityManagerService.java
Simple merge