am a3935ac4: Merge "Move clustering functionality of HistoryAdapter to its own class." into eclair-mr2

Merge commit 'a3935ac40ac3767b13c92b192a0eb69d837a4093' into eclair-mr2-plus-aosp

* commit 'a3935ac40ac3767b13c92b192a0eb69d837a4093':
  Move clustering functionality of HistoryAdapter to its own class.