tree 3af4b52971be6ee0fb45d3a65a03f5185f7397a3
parent 9de6872b4c0ab35e4466fc05f36e0b9801e06a47
parent d424b8d9ccb569c4a2f01de248068fd130e3bd82
author Dianne Hackborn <hackbod@google.com> 1285282942 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285282942 -0700

am d424b8d9: Prepare for a new IActivityController method.

Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp

* commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82':
  Prepare for a new IActivityController method.