Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp * commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82': Prepare for a new IActivityController method.
Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp * commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82': Prepare for a new IActivityController method.