Merge commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56' into eclair-plus-aosp * commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56': Make SINGLE_TOP work with CLEAR_TOP.
Merge commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56' into eclair-plus-aosp * commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56': Make SINGLE_TOP work with CLEAR_TOP.