tree ab4a6d1854bfd74fee7a0392c29524bdc134112c
parent 8bdd8fb0c0860fa6320eac063eb8dc144490e8cd
author Mindy Pereira <mindyp@google.com> 1337899986 -0700
committer Mindy Pereira <mindyp@google.com> 1337900496 -0700

Make inside conversation unread work; merge twopane/onepane controller logic.

These were the same!
Also inside conversation unread was not going back to the conv list.

Change-Id: Ia06bc9f33e424bb8677a9bb360e05dc7de91e811