resolved conflicts for merge of d3cd2596 to master

Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6

core/java/android/app/Activity.java

@@ -4281,7 +4281,14 @@ public class Activity extends ContextThemeWrapper
 
     final void performPause() {
         mFragments.dispatchPause();
+        mCalled = false;
         onPause();
+        if (!mCalled && getApplicationInfo().targetSdkVersion
+                >= android.os.Build.VERSION_CODES.GINGERBREAD) {
+            throw new SuperNotCalledException(
+                    "Activity " + mComponent.toShortString() +
+                    " did not call through to super.onPause()");
+        }
     }
     
     final void performUserLeaving() {