Merge commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac' into eclair-mr2-plus-aosp * commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac': Fix issue #2161169: onStop not being called.
Merge commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac' into eclair-mr2-plus-aosp * commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac': Fix issue #2161169: onStop not being called.