tree 4ac421d81dc5206a5782f50688e2faf7201dc9ba
parent 95d26de9e048ef0342e3aed15a4d5d5c8a6e8493
parent 01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301
author Dianne Hackborn <hackbod@google.com> 1277418239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277418239 -0700

am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.

Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp

* commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301':
  Some ActivityThread/ActivityManager cleanup.