resolved conflicts for merge of 66c429a8 to master

diff --cc src/com/android/browser/BrowserHistoryPage.java
index 0c2bfae,5818e1d..72dffae
--- 1/src/com/android/browser/BrowserHistoryPage.java
--- 2/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@@ -42,8 -41,8 +40,7 @@@ import android.view.ViewGroup
  import android.view.ViewGroup.LayoutParams;
  import android.view.ContextMenu.ContextMenuInfo;
  import android.view.ViewStub;
- import android.webkit.DateSorter;
  import android.webkit.WebIconDatabase.IconListener;
 -import android.widget.AdapterView;
  import android.widget.ExpandableListAdapter;
  import android.widget.ExpandableListView;
  import android.widget.ExpandableListView.ExpandableListContextMenuInfo;