am d425e2d7: am 4a7bb462: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev

* commit 'd425e2d7204fbab1ac1c33fa6f2cd9d557654142':
  Call dispatchFinishTemporaryDetach before returning a transient view

core/java/android/widget/AbsListView.java

@@ -2345,8 +2345,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                 }
             }
 
-            // Scrap view implies temporary detachment.
             isScrap[0] = true;
+
+            // Finish the temporary detach started in addScrapView().
+            transientView.dispatchFinishTemporaryDetach();
             return transientView;
         }
 
@@ -2359,6 +2361,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
             } else {
                 isScrap[0] = true;
 
+                // Finish the temporary detach started in addScrapView().
                 child.dispatchFinishTemporaryDetach();
             }
         }