OSDN Git Service

am d7cd29da: Add facility to run setup wizard after an update.
authorDianne Hackborn <hackbod@google.com>
Fri, 3 Jul 2009 15:58:10 +0000 (08:58 -0700)
committerThe 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
core/java/android/provider/Settings.java
services/java/com/android/server/WindowManagerService.java
services/java/com/android/server/am/ActivityManagerService.java

Simple merge