am 23048752: Merge "Preparing for account refactoring"

* commit '2304875270ddb4b64687a5ba2001a9fa92296203':
  Preparing for account refactoring
Merge "Call correct number of frequently-called contact."
am ae3a0458: Merge "Call correct number of frequently-called contact."

* commit 'ae3a0458edf09207c9434e6fcd0ed2acbe70c7eb':
  Call correct number of frequently-called contact.
Show currently-selected account filter.

When presented with the list of possible filter options,
the currently active option was not highlighted.  Now it is.

Bug: 5222482
Change-Id: Ia9d1ba40f589e89c4390199f9d77ae8b2af2c90c
Merge "Show currently-selected account filter."
am aabc1e81: Merge "Show currently-selected account filter."

* commit 'aabc1e81c2d43827fe2ad0bdde6851bdfb431924':
  Show currently-selected account filter.
Revert "Remove gray line"

This reverts commit 3dee454b1c594d70ba12e6a191ee776f4ebf4fa3
Remove cancel button from display- and sort-order dialogs.

Bug: 5791742
Change-Id: I4072075622fde0f243e0570e7d7eaf93774a0c61
Merge "Revert "Remove gray line""
am 7f0fc68b: Merge "Revert "Remove gray line""

* commit '7f0fc68b7df5f8330b672fb12d14bb7161e91180':
  Revert "Remove gray line"
merge in ics-release history after reset to master
Merge "Remove cancel button from display- and sort-order dialogs."
am abed2cad: Merge "Remove cancel button from display- and sort-order dialogs."

* commit 'abed2cadde0fae8e146275f40c5bc45d297d7a21':
  Remove cancel button from display- and sort-order dialogs.
merge in ics-release history after reset to master
Show correct Toast for search button.

Bug: 5841089
Change-Id: Ib062ab04bfd65499a886f47b788030432d738d51
Fix gap above overscroll indicator in quick-contacts.

There is a 1-pixel gap between the list and the quick-contact
"track".  It looks a bit like a shadow and adds a bit of depth
to the track, but the resulting gap is an eyesore.  The simple
fix is to remove the gap.

Bug: 5748071
Change-Id: Id29c7d359364d28dac8ff17d732b4c80d3388e2d
Merge "Fix gap above overscroll indicator in quick-contacts."
am e347bd90: Show correct Toast for search button.

* commit 'e347bd90b83834dd8ba70ebea9e255baf061e9c5':
  Show correct Toast for search button.
am 66ecc065: Merge "Fix gap above overscroll indicator in quick-contacts."

* commit '66ecc06533dc723954fabebea8edfa4a8d56f40a':
  Fix gap above overscroll indicator in quick-contacts.
merge in ics-release history after reset to master