Merge f-t to m-c

mobile/android/base/widget/ActivityChooserModel.java

@@ -798,7 +798,8 @@ public class ActivityChooserModel extends DataSetObservable {
         for (Iterator<HistoricalRecord> i = mHistoricalRecords.iterator(); i.hasNext();) {
             final HistoricalRecord record = i.next();
             if (record.activity.getPackageName().equals(pkg)) {
-                removed = mHistoricalRecords.remove(record);
+                i.remove();
+                removed = true;
             }
         }