OSDN Git Service

am 6a98f8d9: Merge change 23499 into donut
authorDianne Hackborn <hackbod@google.com>
Wed, 2 Sep 2009 02:11:44 +0000 (19:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2009 02:11:44 +0000 (19:11 -0700)
commitff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d
treef88ea0a73df05a08f1de2b61d3b1e39b31a44ad3
parentcc22efb52e8b5851b7d53099f7f814bfae266124
parent6a98f8d93e4ddd407baad8d9b7481a892001d281
am 6a98f8d9: Merge change 23499 into donut

Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair

* commit '6a98f8d93e4ddd407baad8d9b7481a892001d281':
  Fix content provider
services/java/com/android/server/am/ActivityManagerService.java